diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-07-29 15:45:41 +1000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-09-03 12:05:38 +0000 |
| commit | c3f2c55320d237d1ab7dc877629be259e4955d4d (patch) | |
| tree | df5fc1c5a900b972a944156763477012f5659fa3 /ctdb | |
| parent | cf39c0fc3b00e2245a25352637cad16f9203b5eb (diff) | |
| download | samba-c3f2c55320d237d1ab7dc877629be259e4955d4d.tar.gz | |
ctdb-tests: Inline handling of recovered and notlmaster statuses
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 bb59073515ee5f7886b5d9a20d7b2805857c2708)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index dbf68b05b2e..712932d7d4b 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 rpat + local bits case "$status" in unhealthy) bits="?|?|?|1|*" ;; healthy) bits="?|?|?|0|*" ;; @@ -330,8 +330,16 @@ node_has_status () enabled) bits="?|?|0|*" ;; stopped) bits="?|?|?|?|1|*" ;; notstopped) bits="?|?|?|?|0|*" ;; - recovered) rpat='^Recovery mode:RECOVERY \(1\)$' ;; - notlmaster) rpat="^hash:.* lmaster:${pnn}\$" ;; + recovered) + ! $CTDB status -n "$pnn" | \ + grep -Eq '^Recovery mode:RECOVERY \(1\)$' + return + ;; + notlmaster) + ! $CTDB status -n "$pnn" | \ + grep -Eq "^hash:.* lmaster:${pnn}\$" + return + ;; *) echo "node_has_status: unknown status \"$status\"" return 1 @@ -354,10 +362,8 @@ node_has_status () done return 1 } <<<"$out" # Yay bash! - elif [ -n "$rpat" ] ; then - ! $CTDB status -n "$pnn" | egrep -q "$rpat" else - echo 'node_has_status: unknown mode, neither $bits nor $rpat is set' + echo 'node_has_status: unknown mode, $bits not set' return 1 fi } |