ctdb-scripts: Put output under the control of failure counting

The port checking output should be under the control of the failure
counting.  It shouldn't be printed every time.

Duplicate most of the associated test to ensure that the counter is
correctly reset.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/config/events/legacy/40.vsftpd.script b/ctdb/config/events/legacy/40.vsftpd.script
index 89119d4d06541225d751270d294789cd56103d2b..7bc607e50b8db33269f184552a509038ef80dba0 100755 (executable)
--- a/ctdb/config/events/legacy/40.vsftpd.script
+++ b/ctdb/config/events/legacy/40.vsftpd.script
@@ -43,13 +43,14 @@ ipreallocated)
        ;;
 
 monitor)
-       if ctdb_check_tcp_ports 21; then
+       if output=$(ctdb_check_tcp_ports 21); then
                failcount_reset "$port_21"
        else
                # Set defaults, if unset
                : "${CTDB_VSFTPD_MONITOR_THRESHOLDS:=1:2}"
 
-               failcount_incr "$port_21" "$CTDB_VSFTPD_MONITOR_THRESHOLDS"
+               failcount_incr \
+                       "$port_21" "$CTDB_VSFTPD_MONITOR_THRESHOLDS" "$output"
        fi
        ;;
 esac

diff --git a/ctdb/tests/UNIT/eventscripts/40.vsftpd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/40.vsftpd.monitor.002.sh
index f825be4d02a1d0d943c80248926fb4f1c461a2f8..abdb3e7f255439e6c1d8e6d2ff3c4c504b457009 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/40.vsftpd.monitor.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/40.vsftpd.monitor.002.sh
@@ -12,8 +12,8 @@ simple_test
 setup "down"
 
 ok <<EOF
-vsftpd not listening on TCP port 21
 WARNING: vsftpd listening on TCP port 21: fail count 1 >= threshold 1
+vsftpd not listening on TCP port 21
 EOF
 simple_test
 
@@ -27,19 +27,44 @@ simple_test
 setup "down"
 
 ok <<EOF
-vsftpd not listening on TCP port 21
 WARNING: vsftpd listening on TCP port 21: fail count 1 >= threshold 1
+vsftpd not listening on TCP port 21
 EOF
 simple_test
 
 required_result 1 <<EOF
-vsftpd not listening on TCP port 21
 ERROR: vsftpd listening on TCP port 21: fail count 2 >= threshold 2
+vsftpd not listening on TCP port 21
 EOF
 simple_test
 
 required_result 1 <<EOF
+ERROR: vsftpd listening on TCP port 21: fail count 3 >= threshold 2
+EOF
+simple_test
+
+setup "up"
+
+ok <<EOF
+NOTICE: vsftpd listening on TCP port 21: no longer failing
+EOF
+simple_test
+
+setup "down"
+
+ok <<EOF
+WARNING: vsftpd listening on TCP port 21: fail count 1 >= threshold 1
 vsftpd not listening on TCP port 21
+EOF
+simple_test
+
+required_result 1 <<EOF
+ERROR: vsftpd listening on TCP port 21: fail count 2 >= threshold 2
+vsftpd not listening on TCP port 21
+EOF
+simple_test
+
+required_result 1 <<EOF
 ERROR: vsftpd listening on TCP port 21: fail count 3 >= threshold 2
 EOF
 simple_test