From: Vallari Agrawal <vallari.agrawal@ibm.com>
Date: Tue, 10 Jun 2025 14:47:13 +0000 (+0530)
Subject: qa/suites/nvmeof: remove "--refresh" from "ceph orch ps/ls"
X-Git-Tag: testing/wip-rishabh-testing-20250617.173904~17^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=958e6d130cb23d3f0cac3c54ff44b0880bea7a14;p=ceph-ci.git

qa/suites/nvmeof: remove "--refresh" from "ceph orch ps/ls"

Also in scalability test, set SCALING_DELAYS: '400'
instead of '300' because we might need more time for
namespace load balancing.

Fixes: https://tracker.ceph.com/issues/70927

Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>
---

diff --git a/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml b/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
index 6355fc2e74a..236d62dc940 100644
--- a/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
+++ b/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
@@ -38,5 +38,5 @@ tasks:
         - nvmeof/scalability_test.sh nvmeof.b,nvmeof.c,nvmeof.d
         - nvmeof/scalability_test.sh nvmeof.b,nvmeof.c
     env:
-      SCALING_DELAYS: '300'
+      SCALING_DELAYS: '400'
       RUNTIME: '1200'
diff --git a/qa/tasks/nvmeof.py b/qa/tasks/nvmeof.py
index e37d794da64..591f1b60db8 100644
--- a/qa/tasks/nvmeof.py
+++ b/qa/tasks/nvmeof.py
@@ -369,8 +369,8 @@ class NvmeofThrasher(Thrasher, Greenlet):
                 for d in self.daemons:
                     random_gateway_host = d.remote
                     d.remote.sh(d.status_cmd, check_status=False)
-                random_gateway_host.run(args=['ceph', 'orch', 'ls', '--refresh'])
-                random_gateway_host.run(args=['ceph', 'orch', 'ps', '--daemon-type', 'nvmeof', '--refresh'])
+                random_gateway_host.run(args=['ceph', 'orch', 'ls'])
+                random_gateway_host.run(args=['ceph', 'orch', 'ps', '--daemon-type', 'nvmeof'])
                 random_gateway_host.run(args=['ceph', 'health', 'detail'])
                 random_gateway_host.run(args=['ceph', '-s'])
                 random_gateway_host.run(args=['ceph', 'nvme-gw', 'show', 'mypool', 'mygroup0'])
diff --git a/qa/workunits/nvmeof/mtls_test.sh b/qa/workunits/nvmeof/mtls_test.sh
index e13ca530e8d..ac171a012c7 100755
--- a/qa/workunits/nvmeof/mtls_test.sh
+++ b/qa/workunits/nvmeof/mtls_test.sh
@@ -23,7 +23,7 @@ wait_for_service() {
     MAX_RETRIES=30
     for ((RETRY_COUNT=1; RETRY_COUNT<=MAX_RETRIES; RETRY_COUNT++)); do
 
-        if ceph orch ls --refresh | grep -q "nvmeof"; then
+        if ceph orch ls | grep -q "nvmeof"; then
             echo "Found nvmeof in the output!"
             break
         fi
@@ -34,7 +34,7 @@ wait_for_service() {
         sleep 5
     done
     ceph orch ps
-    ceph orch ls --refresh
+    ceph orch ls
 }
 
 # deploy mtls
diff --git a/qa/workunits/nvmeof/scalability_test.sh b/qa/workunits/nvmeof/scalability_test.sh
index f95659cd5a9..d83cbcdd0e4 100755
--- a/qa/workunits/nvmeof/scalability_test.sh
+++ b/qa/workunits/nvmeof/scalability_test.sh
@@ -46,7 +46,7 @@ status_checks() {
 
         diff=$((num_namespaces - expected_avg_ns))
         if [[ $diff -lt -1 || $diff -gt 1 ]]; then
-            echo "Gateway $gw_id has num-namespaces ($num_namespaces), expected around $expected_ns. Indicates a problem in ns load-balancing."
+            echo "Gateway $gw_id has num-namespaces ($num_namespaces), expected around $expected_ns_count. Indicates a problem in ns load-balancing."
             exit 1
         fi
     done