ctdb-eventscripts: Remove NAT gateway "monitor" event

This event was introduced to handle misconfiguration.  For example,
where all nodes where configured as NAT gateway slaves.

However, this event can fail when there are performance issues and
capabilities can't be retrieved from a remote node.  The problem is
most likely with the remote node, so marking the local node UNHEALTHY
is probably a mistake.

Having a NAT gateway master node only matters in "ipreallocated", so
leave it to do the checking.  Given that a node will run
"ipreallocated" as part of the first recovery, this should cause
misconfigurations to be detected nice and early.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

5 files changed, 4 insertions, 10 deletions

diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
index f925d4b7357..a541d31957d 100755
--- a/ctdb/config/events.d/11.natgw
+++ b/ctdb/config/events.d/11.natgw
@@ -163,12 +163,6 @@ case "$1" in
 	natgw_clear
 	;;
 
-    monitor)
-	natgw_check_config
-	natgw_set_capability
-	natgw_ensure_master "$1"
-	;;
-
     *)
 	ctdb_standard_event_handler "@"
 	;;
diff --git a/ctdb/tests/eventscripts/11.natgw.002.sh b/ctdb/tests/eventscripts/11.natgw.002.sh
index e496e4a3c4a..c9054068df4 100755
--- a/ctdb/tests/eventscripts/11.natgw.002.sh
+++ b/ctdb/tests/eventscripts/11.natgw.002.sh
@@ -18,7 +18,7 @@ required_result 1 <<EOF
 error: CTDB_NATGW_NODES=${CTDB_NATGW_NODES} unreadable
 EOF
 
-for i in "startup" "ipreallocated" "monitor" ; do
+for i in "startup" "ipreallocated" ; do
     simple_test_event "$i"
 done
 
diff --git a/ctdb/tests/eventscripts/11.natgw.003.sh b/ctdb/tests/eventscripts/11.natgw.003.sh
index cb2358fe2ec..eb821dca48b 100755
--- a/ctdb/tests/eventscripts/11.natgw.003.sh
+++ b/ctdb/tests/eventscripts/11.natgw.003.sh
@@ -16,6 +16,6 @@ CTDB_NATGW_PUBLIC_IFACE=""
 
 required_result 1 "Invalid configuration: CTDB_NATGW_PUBLIC_IFACE not set"
 
-for i in "startup" "ipreallocated" "monitor" ; do
+for i in "startup" "ipreallocated" ; do
     simple_test_event "$i"
 done
diff --git a/ctdb/tests/eventscripts/11.natgw.004.sh b/ctdb/tests/eventscripts/11.natgw.004.sh
index 76f1a54e258..10bf22c711a 100755
--- a/ctdb/tests/eventscripts/11.natgw.004.sh
+++ b/ctdb/tests/eventscripts/11.natgw.004.sh
@@ -16,6 +16,6 @@ CTDB_NATGW_PUBLIC_IP=""
 
 required_result 1 "Invalid configuration: CTDB_NATGW_PUBLIC_IP not set"
 
-for i in "startup" "ipreallocated" "monitor" ; do
+for i in "startup" "ipreallocated" ; do
     simple_test_event "$i"
 done
diff --git a/ctdb/tests/eventscripts/11.natgw.005.sh b/ctdb/tests/eventscripts/11.natgw.005.sh
index 94a80c88825..074fcdaa1c5 100755
--- a/ctdb/tests/eventscripts/11.natgw.005.sh
+++ b/ctdb/tests/eventscripts/11.natgw.005.sh
@@ -19,6 +19,6 @@ Inconsistent test configuration - master node is slave-only
 There is no NATGW master node
 EOF
 
-for i in "ipreallocated" "monitor" ; do
+for i in "ipreallocated" ; do
     simple_test_event "$i"
 done