From 74bb2c06171ca54f21cde7c9024371bd3b6cc10a Mon Sep 17 00:00:00 2001
From: Nitzan Mordechai <nmordech@redhat.com>
Date: Wed, 1 May 2024 13:08:03 +0000
Subject: [PATCH] test: ceph daemon command with asok path
pg-split-merge using ceph daemon command to check merge.
but it doesn't use asok path, which causes the check not to
return the correct output. change the command to use asok path.
Fixes: https://tracker.ceph.com/issues/65737
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit a76bf0de58547961d5fbc6d644005a3a5506d443)
---
qa/standalone/osd/pg-split-merge.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qa/standalone/osd/pg-split-merge.sh b/qa/standalone/osd/pg-split-merge.sh
index 7f2899b6078..a8927763e85 100755
--- a/qa/standalone/osd/pg-split-merge.sh
+++ b/qa/standalone/osd/pg-split-merge.sh
@@ -103,7 +103,7 @@ function TEST_import_after_merge_and_gap() {
ceph osd pool set foo pg_num 1
sleep 5
- while ceph daemon osd.0 perf dump | jq '.osd.numpg' | grep 2 ; do sleep 1 ; done
+ while CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) perf dump | jq '.osd.numpg' | grep 2 ; do sleep 1 ; done
wait_for_clean || return 1
#
@@ -176,7 +176,7 @@ function TEST_import_after_split() {
ceph osd pool set foo pg_num 2
sleep 5
- while ceph daemon osd.0 perf dump | jq '.osd.numpg' | grep 1 ; do sleep 1 ; done
+ while CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) perf dump | jq '.osd.numpg' | grep 1 ; do sleep 1 ; done
wait_for_clean || return 1
kill_daemons $dir TERM osd.0 || return 1