From c39a8217dd2c9c696af6c191860d1b5e9c375612 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 5 Oct 2017 13:36:46 -0400 Subject: [PATCH] internal: Be okay with an empty /var/lib/ceph dir Signed-off-by: David Galloway --- teuthology/task/internal/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/task/internal/__init__.py b/teuthology/task/internal/__init__.py index 2e16423ade..747b8936e5 100644 --- a/teuthology/task/internal/__init__.py +++ b/teuthology/task/internal/__init__.py @@ -252,11 +252,11 @@ def serialize_remote_roles(ctx, config): def check_ceph_data(ctx, config): """ - Check for old /var/lib/ceph directories and detect staleness. + Check for old /var/lib/ceph subdirectories and detect staleness. """ - log.info('Checking for old /var/lib/ceph...') + log.info('Checking for non-empty /var/lib/ceph...') processes = ctx.cluster.run( - args=['test', '!', '-e', '/var/lib/ceph'], + args='test -z $(ls -A /var/lib/ceph)', wait=False, ) failed = False -- 2.39.5