]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-daemon: make infer_fsid behave when /var/lib/ceph dne 31831/head
authorSage Weil <sage@redhat.com>
Sat, 23 Nov 2019 15:02:28 +0000 (09:02 -0600)
committerSage Weil <sage@redhat.com>
Sat, 23 Nov 2019 15:02:28 +0000 (09:02 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/ceph-daemon/ceph-daemon

index 9e4216f3b3d1c18492c398349eb40482a41b9814..85bc175afe2c66f3605854cbe046fd6ca5dd1312 100755 (executable)
@@ -219,10 +219,10 @@ def infer_fsid(func):
             return func()
 
         fsid_list = []
-        for i in os.listdir(args.data_dir):
-            if is_fsid(i):
-                fsid_list.append(i)
-
+        if os.path.exists(args.data_dir):
+            for i in os.listdir(args.data_dir):
+                if is_fsid(i):
+                    fsid_list.append(i)
         logger.debug('Found fsids %s' % str(fsid_list))
 
         if not fsid_list: