From: Martin Schwenke <martin@meltin.net>
Date: Wed, 6 Jul 2016 05:06:24 +0000 (+1000)
Subject: ctdb-scripts: Drop use of ctdb_check_counter from vsftpd event script
X-Git-Tag: tdb-1.3.10~277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=770fe1ff37bb5d3c0407be326ab64fadca71c03e;p=thirdparty%2Fsamba.git

ctdb-scripts: Drop use of ctdb_check_counter from vsftpd event script

This makes the logic more obvious.

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

diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd
index cdc99830beb..2b8cddef8e4 100755
--- a/ctdb/config/events.d/40.vsftpd
+++ b/ctdb/config/events.d/40.vsftpd
@@ -23,8 +23,6 @@ service_reconfigure ()
     service $service_name restart
 }
 
-service_fail_limit=2
-
 loadconfig
 
 ctdb_start_stop_service
@@ -51,9 +49,12 @@ monitor)
 		ctdb_counter_init
 	else
 		ctdb_counter_incr
-		ctdb_check_counter
-		ctdb_check_counter "quiet" -ge 1 || \
-		    echo "WARNING: vsftpd not listening but less than $service_fail_limit consecutive failures, not unhealthy yet"
+		num_fails=$(ctdb_counter_get)
+		if [ "$num_fails" -ge 2 ] ; then
+			die "ERROR: ${num_fails} consecutive failures for vsftpd, marking node unhealthy"
+		elif [ "$num_fails" -eq 1 ] ; then
+			echo "WARNING: vsftpd not listening but less than 2 consecutive failures, not unhealthy yet"
+		fi
 	fi
 	;;
 esac