From: Martin Schwenke <martin@meltin.net>
Date: Fri, 10 Jun 2022 00:32:01 +0000 (+1000)
Subject: ctdb-scripts: Only run unhealthy call-out when passing threshold
X-Git-Tag: tevent-0.13.0~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e396eb9fbc7b843181cf095051221305ff3578ed;p=thirdparty%2Fsamba.git

ctdb-scripts: Only run unhealthy call-out when passing threshold

For memory usage, no need to dump all of this data on every failed
monitor event.  The first call will be enough to diagnose the problem.
The node will then go unhealthy, drop clients and memory usage should
then drop.

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

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Jul 22 07:32:54 UTC 2022 on sn-devel-184
---

diff --git a/ctdb/config/events/legacy/05.system.script b/ctdb/config/events/legacy/05.system.script
index 70e4678f45b..56a07c7cc77 100755
--- a/ctdb/config/events/legacy/05.system.script
+++ b/ctdb/config/events/legacy/05.system.script
@@ -44,13 +44,23 @@ check_thresholds()
 	# script_state_dir set by ctdb_setup_state_dir()
 	# shellcheck disable=SC2154
 	_cache="${script_state_dir}/cache_${_t}"
+	if [ -r "$_cache" ]; then
+		read -r _prev <"$_cache"
+	else
+		_prev=0
+	fi
 	if validate_percentage "$_unhealthy_threshold" "$_thing"; then
 		if [ "$_usage" -ge "$_unhealthy_threshold" ]; then
 			printf 'ERROR: %s utilization %d%% >= threshold %d%%\n' \
 			       "$_thing" \
 			       "$_usage" \
 			       "$_unhealthy_threshold"
-			eval "$_unhealthy_callout"
+			# Only run unhealthy callout if passing the
+			# unhealthy threshold.  That is, if the
+			# previous usage was below the threshold.
+			if [ "$_prev" -lt "$_unhealthy_threshold" ]; then
+				eval "$_unhealthy_callout"
+			fi
 			echo "$_usage" >"$_cache"
 			exit 1
 		fi
@@ -58,11 +68,6 @@ check_thresholds()
 
 	if validate_percentage "$_warn_threshold" "$_thing"; then
 		if [ "$_usage" -ge "$_warn_threshold" ]; then
-			if [ -r "$_cache" ]; then
-				read -r _prev <"$_cache"
-			else
-				_prev=""
-			fi
 			if [ "$_usage" = "$_prev" ]; then
 				return
 			fi