From 52ee6a4c49e5749463811b57f4af4a0824875b70 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 1 Jun 2017 11:37:20 +0200 Subject: [PATCH] ceph-disk: do not setup_statedir on trigger trigger may run when statedir is unavailable and does not use it. Fixes: http://tracker.ceph.com/issues/19941 Signed-off-by: Loic Dachary (cherry picked from commit 16bfbdd3d9988523bba31aace516c303057daa58) --- src/ceph-disk/ceph_disk/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index 97a905ff72250..92ec2306eb24d 100755 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -5431,7 +5431,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 -- 2.39.5