qa: add 'refresh' config to cephadm.wait_for_service

And enable with 'refresh: True' for nvmeof suite.

Fixes: https://tracker.ceph.com/issues/73538
Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

diff --git a/qa/suites/nvmeof/basic/workloads/nvmeof_initiator.yaml b/qa/suites/nvmeof/basic/workloads/nvmeof_initiator.yaml
index 4ff9cc397bb5dbab69c6c46f3f706903abaa1202..29b67c84d70262d65cc74f1b7d1d32f5bd876563 100644 (file)
--- a/qa/suites/nvmeof/basic/workloads/nvmeof_initiator.yaml
+++ b/qa/suites/nvmeof/basic/workloads/nvmeof_initiator.yaml
@@ -12,6 +12,7 @@ tasks:
 
 - cephadm.wait_for_service:
     service: nvmeof.mypool.mygroup0
+    refresh: True
 
 - workunit:
     no_coverage_and_limits: true

diff --git a/qa/suites/nvmeof/basic/workloads/nvmeof_mtls.yaml b/qa/suites/nvmeof/basic/workloads/nvmeof_mtls.yaml
index e378f3b4d273ae1eb056e47beb6ef685c34a2055..91129e67e6379adc9876fb130049a3ee9c809a34 100644 (file)
--- a/qa/suites/nvmeof/basic/workloads/nvmeof_mtls.yaml
+++ b/qa/suites/nvmeof/basic/workloads/nvmeof_mtls.yaml
@@ -13,6 +13,7 @@ tasks:
 
 - cephadm.wait_for_service:
     service: nvmeof.mypool.mygroup0
+    refresh: True
 
 - workunit:
     no_coverage_and_limits: true

diff --git a/qa/suites/nvmeof/basic/workloads/nvmeof_namespaces.yaml b/qa/suites/nvmeof/basic/workloads/nvmeof_namespaces.yaml
index 95d019414e6fb3e474964746244186a2d5d3134a..5278bf47387b227bade48eac950aafbee63cf848 100644 (file)
--- a/qa/suites/nvmeof/basic/workloads/nvmeof_namespaces.yaml
+++ b/qa/suites/nvmeof/basic/workloads/nvmeof_namespaces.yaml
@@ -12,6 +12,7 @@ tasks:
 
 - cephadm.wait_for_service:
     service: nvmeof.mypool.mygroup0
+    refresh: True
 
 - workunit:
     no_coverage_and_limits: true

diff --git a/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml b/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
index 236d62dc940a1a8e2634939452b0337142513500..1f087af536ec1a88bcbf5638ee22f5bc5349e02c 100644 (file)
--- a/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
+++ b/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
@@ -12,6 +12,7 @@ tasks:
 
 - cephadm.wait_for_service:
     service: nvmeof.mypool.mygroup0
+    refresh: True
 
 - workunit:
     no_coverage_and_limits: true

diff --git a/qa/suites/nvmeof/thrash/gateway-initiator-setup/10-subsys-90-namespace-no_huge_pages.yaml b/qa/suites/nvmeof/thrash/gateway-initiator-setup/10-subsys-90-namespace-no_huge_pages.yaml
index d2da1d0877aff248f011641d5581a735456be0f6..54844445b0000845531b80e0fff16f81d98f7d43 100644 (file)
--- a/qa/suites/nvmeof/thrash/gateway-initiator-setup/10-subsys-90-namespace-no_huge_pages.yaml
+++ b/qa/suites/nvmeof/thrash/gateway-initiator-setup/10-subsys-90-namespace-no_huge_pages.yaml
@@ -12,6 +12,7 @@ tasks:
 
 - cephadm.wait_for_service:
     service: nvmeof.mypool.mygroup0
+    refresh: True
 
 - exec:
     host.a:
@@ -25,6 +26,7 @@ tasks:
       
 - cephadm.wait_for_service:
     service: nvmeof.mypool.mygroup0
+    refresh: True
 
 - workunit:
     no_coverage_and_limits: true

diff --git a/qa/suites/nvmeof/thrash/gateway-initiator-setup/16-subsys-4-namespace.yaml b/qa/suites/nvmeof/thrash/gateway-initiator-setup/16-subsys-4-namespace.yaml
index bfb8130135d67ba900b4ec7fbc71c6f6aa618cb7..9a8d5d8ffc9e3b36ce97de311808fc420d57b99a 100644 (file)
--- a/qa/suites/nvmeof/thrash/gateway-initiator-setup/16-subsys-4-namespace.yaml
+++ b/qa/suites/nvmeof/thrash/gateway-initiator-setup/16-subsys-4-namespace.yaml
@@ -12,6 +12,7 @@ tasks:
 
 - cephadm.wait_for_service:
     service: nvmeof.mypool.mygroup0
+    refresh: True
 
 - workunit:
     no_coverage_and_limits: true

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 5d48c904e619c64c314c3b82037999acc6bebfef..3fe45ed03885860664c012cafb5a9169a1ce33f0 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1523,14 +1523,15 @@ def apply(ctx, config):
 
 
 
-def _orch_ls(ctx, cluster_name):
+def _orch_ls(ctx, cluster_name, refresh=False):
+    args = ['ceph', 'orch', 'ls', '-f', 'json']
+    if refresh:
+        args += ['--refresh']
     r = _shell(
         ctx=ctx,
         cluster_name=cluster_name,
         remote=ctx.ceph[cluster_name].bootstrap_remote,
-        args=[
-            'ceph', 'orch', 'ls', '-f', 'json',
-        ],
+        args=args,
         stdout=StringIO(),
     )
     return json.loads(r.stdout.getvalue())
@@ -1544,11 +1545,13 @@ def wait_for_service(ctx, config):
         - cephadm.wait_for_service:
             service: rgw.foo
             timeout: 60    # defaults to 300
+            refresh: True  # defaults to False
 
     """
     cluster_name = config.get('cluster', 'ceph')
     timeout = config.get('timeout', 300)
     service = config.get('service')
+    refresh = config.get('refresh', False)
     assert service
 
     log.info(
@@ -1556,7 +1559,7 @@ def wait_for_service(ctx, config):
     )
     with contextutil.safe_while(sleep=1, tries=timeout) as proceed:
         while proceed():
-            j = _orch_ls(ctx, cluster_name)
+            j = _orch_ls(ctx, cluster_name, refresh)
             svc = None
             for s in j:
                 if s['service_name'] == service: