]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: do not setup_statedir on trigger 15504/head
authorLoic Dachary <ldachary@redhat.com>
Thu, 1 Jun 2017 09:37:20 +0000 (11:37 +0200)
committerVicente Cheng <freeze.bilsted@gmail.com>
Tue, 20 Jun 2017 08:02:39 +0000 (16:02 +0800)
trigger may run when statedir is unavailable and does not use it.

Fixes: http://tracker.ceph.com/issues/19941
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 16bfbdd3d9988523bba31aace516c303057daa58)

src/ceph-disk/ceph_disk/main.py

index 5ba0e1f1f30f891545dc34c8b55c2409dd37b4eb..cabd7fff989504a0422de878d66ad731629a6875 100755 (executable)
@@ -5032,7 +5032,9 @@ def main(argv):
         path = os.environ.get('PATH', os.defpath)
         os.environ['PATH'] = args.prepend_to_path + ":" + path
 
-    setup_statedir(args.statedir)
+    if args.func.__name__ != 'main_trigger':
+        # trigger may run when statedir is unavailable and does not use it
+        setup_statedir(args.statedir)
     setup_sysconfdir(args.sysconfdir)
 
     global CEPH_PREF_USER