From f18aca87463b58fb686bf927b509f80c4d36e23e Mon Sep 17 00:00:00 2001 From: Yin Congmin Date: Mon, 7 Sep 2020 15:24:56 +0800 Subject: [PATCH] qa: check immutable object cache content fix check immutable cache does not work Signed-off-by: Yin Congmin --- qa/tasks/immutable_object_cache.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qa/tasks/immutable_object_cache.py b/qa/tasks/immutable_object_cache.py index 0635c9702902a..b8034de4702e7 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', -- 2.39.5