Merge lp:~tenbrae/mysql-mmm/fix-645460 into lp:mysql-mmm

[aeva black]

Fixed bug "mmm tries to kill_host when replication delays in PASSIVE mode" # 645460

Unmerged revisions

148. By Devananda <deva@Apsara> on 2010-09-22

fixes bug #645460 -- monitor in PASSIVE mode will call _kill_host unnecessarily

=== modified file 'lib/Monitor/Monitor.pm'
--- lib/Monitor/Monitor.pm	2010-05-05 11:41:23 +0000
+++ lib/Monitor/Monitor.pm	2010-11-11 21:07:04 +0000
@@ -452,6 +452,7 @@
 				next if ($self->is_manual);
 				$self->roles->clear_roles($host);
 				if (!$self->send_agent_status($host)) {
+               next if  ($self->is_passive || !$main::have_net);
 					ERROR sprintf("Can't send offline status notification to '%s' - killing it!", $host);
 					$self->_kill_host($host, $checks->ping($host));
 				}
@@ -471,6 +472,7 @@
 				next if ($self->is_manual);
 				$self->roles->clear_roles($host);
 				if (!$self->send_agent_status($host)) {
+               next if  ($self->is_passive || !$main::have_net);
 					ERROR sprintf("Can't send offline status notification to '%s' - killing it!", $host);
 					$self->_kill_host($host, $checks->ping($host));
 				}
@@ -484,6 +486,7 @@
 				next if ($self->is_manual);
 				$self->roles->clear_roles($host);
 				if (!$self->send_agent_status($host)) {
+               next if  ($self->is_passive || !$main::have_net);
 					ERROR sprintf("Can't send offline status notification to '%s' - killing it!", $host);
 					$self->_kill_host($host, $checks->ping($host));
 				}
@@ -622,6 +625,7 @@
 				FATAL sprintf("State of host '%s' changed from %s to HARD_OFFLINE (ping: %s, mysql: %s)", $host, $state, ($ping? 'OK' : 'not OK'), ($mysql? 'OK' : 'not OK'));
 				$agent->state('HARD_OFFLINE');
 				if (!$self->send_agent_status($host)) {
+               next if  ($self->is_passive || !$main::have_net);
 					ERROR sprintf("Can't send offline status notification to '%s' - killing it!", $host);
 					$self->_kill_host($host, $checks->ping($host));
 				}
@@ -663,6 +667,7 @@
 #   			next if ($host_state eq 'REPLICATION_DELAY'); 
 				# NOTE host_state should never be ADMIN_OFFLINE at this point 
 				if (!$ret) { 
+               next if  ($self->is_passive || !$main::have_net);
 					ERROR sprintf("Can't send offline status notification to '%s' - killing it!", $host); 
 					$self->_kill_host($host, $checks->ping($host)); 
 				}