Skip to content

Commit 2f45ce7

Browse files
committed
Fix remtrans_origin poll all cluster nodes for comdb2_active_osqls
Signed-off-by: mkhullar <mohit.khullar@gmail.com>
1 parent 5883889 commit 2f45ce7

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

  • tests/remtran_origin.test

tests/remtran_origin.test/runit

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,20 @@ commit
2828
EOF
2929
BG_PID=$!
3030

31-
# Poll comdb2_active_osqls on DST_DB for the remtran session (argv0=comdb2.tsk)
31+
# comdb2_active_osqls is node-local, so poll every node in the cluster
32+
dst_nodes=$(cdb2sql --tabs $DST_OPT $DST_DB default "SELECT host FROM comdb2_cluster" 2>/dev/null)
33+
3234
result=""
3335
for i in $(seq 1 12); do
3436
sleep 1
35-
result=$(cdb2sql --tabs $DST_OPT $DST_DB default \
36-
"SELECT origin, argv0 FROM comdb2_active_osqls WHERE argv0='comdb2.tsk'" 2>/dev/null)
37-
if [[ -n "$result" ]]; then
38-
echo "Found at poll $i: $result"
39-
break
40-
fi
37+
for node in $dst_nodes; do
38+
result=$(cdb2sql --tabs --host "$node" $DST_OPT $DST_DB \
39+
"SELECT origin, argv0 FROM comdb2_active_osqls WHERE argv0='comdb2.tsk'" 2>/dev/null)
40+
if [[ -n "$result" ]]; then
41+
echo "Found at poll $i on $node: $result"
42+
break 2
43+
fi
44+
done
4145
done
4246

4347
wait $BG_PID || true

0 commit comments

Comments
 (0)