From: Ilya Dryomov <idryomov@gmail.com>
Date: Sun, 16 Mar 2025 16:33:58 +0000 (+0100)
Subject: qa/workunits/rbd: adjust grep invocation in is_leader()
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4355d60d6bf0731a2f6d2e59cff4fa82ed491bda;p=ceph.git

qa/workunits/rbd: adjust grep invocation in is_leader()

admin_daemon() no longer populates stdout and stderr, all output is
redirected inside of run_cmd_internal().

This unbreaks "TEST: release leader and wait it is reacquired".

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/qa/workunits/rbd/rbd_mirror_ha.sh b/qa/workunits/rbd/rbd_mirror_ha.sh
index e5a086b82ab86..7add522f5285e 100755
--- a/qa/workunits/rbd/rbd_mirror_ha.sh
+++ b/qa/workunits/rbd/rbd_mirror_ha.sh
@@ -19,8 +19,8 @@ is_leader()
     test -n "${pool}" || pool=${POOL}
 
     admin_daemon "${CLUSTER1}:${instance}" \
-		 rbd mirror status ${pool} ${CLUSTER2}${PEER_CLUSTER_SUFFIX} |
-	grep '"leader": true'
+		 rbd mirror status ${pool} ${CLUSTER2}${PEER_CLUSTER_SUFFIX}
+    grep '"leader": true' < "${CMD_STDOUT}"
 }
 
 wait_for_leader()