Merge pull request #3973 from sysown/v2.x-3968

Fix monitor crash when tens of thousands of servers are configured - Closes #3938
sysown · Sep 13, 2022 · b45c3f6 · b45c3f6
2 parents 7d9e2e8 + ac738c2
commit b45c3f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp
@@ -2655,6 +2655,7 @@ void * MySQL_Monitor::monitor_ping() {
 			int us=100;
 			if (resultset->rows_count) {
 				us=mysql_thread___monitor_ping_interval/2/resultset->rows_count;
+				us = us == 0 ? 1 : us;
 				us*=40;
 				if (us > 1000000) {
 					us = 10000;
@@ -2926,6 +2927,7 @@ void * MySQL_Monitor::monitor_read_only() {
 			int us=100;
 			if (resultset->rows_count) {
 				us=mysql_thread___monitor_read_only_interval/2/resultset->rows_count;
+				us = us == 0 ? 1 : us;
 				us*=40;
 				if (us > 1000000) {
 					us = 10000;

diff --git a/lib/ProxySQL_GloVars.cpp b/lib/ProxySQL_GloVars.cpp
@@ -169,6 +169,7 @@ void ProxySQL_GlobalVariables::install_signal_handler() {
 	signal(SIGTERM, term_handler);
 	signal(SIGSEGV, crash_handler);
 	signal(SIGABRT, crash_handler);
+	signal(SIGFPE, crash_handler);
 	signal(SIGPIPE, SIG_IGN);
 }