diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-07-29 15:40:16 +1000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-09-03 12:05:38 +0000 |
| commit | cf39c0fc3b00e2245a25352637cad16f9203b5eb (patch) | |
| tree | c00268db67ad396652cbb8b82ec46f3ae51d33b6 /ctdb | |
| parent | fd8a55bb3f4ec61ddd491b4e3722bb6cd4a56a46 (diff) | |
| download | samba-cf39c0fc3b00e2245a25352637cad16f9203b5eb.tar.gz | |
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)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 8 |
1 files changed, 2 insertions, 6 deletions
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 } |