From: Yin Congmin <congmin.yin@intel.com>
Date: Mon, 7 Sep 2020 07:24:56 +0000 (+0800)
Subject: qa: check immutable object cache content
X-Git-Tag: v16.1.0~1012^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37110%2Fhead;p=ceph.git

qa: check immutable object cache content

fix check immutable cache does not work

Signed-off-by: Yin Congmin <congmin.yin@intel.com>
---

diff --git a/qa/tasks/immutable_object_cache.py b/qa/tasks/immutable_object_cache.py
index 0635c970290..b8034de4702 100644
--- a/qa/tasks/immutable_object_cache.py
+++ b/qa/tasks/immutable_object_cache.py
@@ -32,16 +32,22 @@ def immutable_object_cache(ctx, config):
     try:
         yield
     finally:
-        log.info("cleanup immutable object cache")
+        log.info("check and cleanup immutable object cache")
         for client, client_config in config.items():
             client_config = client_config if client_config is not None else dict()
             (remote,) = ctx.cluster.only(client).remotes.keys()
+            cache_path = client_config.get('immutable object cache path', '/tmp/ceph-immutable-object-cache')
+            ls_command = '"$(ls {} )"'.format(cache_path)
+            remote.run(
+                args=[
+                    'test', '-n', run.Raw(ls_command),
+                    ]
+                )
             remote.run(
                 args=[
                     'sudo', 'killall', '-s', '9', 'ceph-immutable-object-cache', run.Raw('||'), 'true',
                     ]
                 )
-            cache_path = client_config.get('immutable object cache path', '/tmp/ceph-immutable-object-cache')
             remote.run(
                 args=[
                     'sudo', 'rm', '-rf', cache_path, run.Raw('||'), 'true',