From: Martin Schwenke <martin@meltin.net>
Date: Mon, 29 Jul 2019 05:40:16 +0000 (+1000)
Subject: ctdb-tests: Drop unused node statuses frozen/unfrozen
X-Git-Tag: samba-4.9.14~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf39c0fc3b00e2245a25352637cad16f9203b5eb;p=thirdparty%2Fsamba.git

ctdb-tests: Drop unused node statuses frozen/unfrozen

Silently drop unused local variable mpat.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14085

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 9b09a87326af28877301ad27bcec5bb13744e2b6)
---

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 0a400443240..dbf68b05b2e 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -318,7 +318,7 @@ node_has_status ()
 	local pnn="$1"
 	local status="$2"
 
-	local bits fpat mpat rpat
+	local bits rpat
 	case "$status" in
 	unhealthy)    bits="?|?|?|1|*" ;;
 	healthy)      bits="?|?|?|0|*" ;;
@@ -330,8 +330,6 @@ node_has_status ()
 	enabled)      bits="?|?|0|*" ;;
 	stopped)      bits="?|?|?|?|1|*" ;;
 	notstopped)   bits="?|?|?|?|0|*" ;;
-	frozen)       fpat='^[[:space:]]+frozen[[:space:]]+1$' ;;
-	unfrozen)     fpat='^[[:space:]]+frozen[[:space:]]+0$' ;;
 	recovered)    rpat='^Recovery mode:RECOVERY \(1\)$' ;;
 	notlmaster)   rpat="^hash:.* lmaster:${pnn}\$" ;;
 	*)
@@ -356,12 +354,10 @@ node_has_status ()
 			done
 			return 1
 		} <<<"$out" # Yay bash!
-	elif [ -n "$fpat" ] ; then
-		$CTDB statistics -n "$pnn" | egrep -q "$fpat"
 	elif [ -n "$rpat" ] ; then
 		! $CTDB status -n "$pnn" | egrep -q "$rpat"
 	else
-		echo 'node_has_status: unknown mode, neither $bits nor $fpat is set'
+		echo 'node_has_status: unknown mode, neither $bits nor $rpat is set'
 		return 1
 	fi
 }