From: Kefu Chai <kchai@redhat.com>
Date: Tue, 6 Sep 2016 09:41:37 +0000 (+0800)
Subject: tasks/ceph_manager: allow ObjectStoreTool to not revive OSD after done with it
X-Git-Tag: v11.1.1~58^2^2~97^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a053ce091e1aa910a1d01aec489203500e67efe5;p=ceph.git

tasks/ceph_manager: allow ObjectStoreTool to not revive OSD after done with it

rebuild_mondb task is not able to offer OSD with any monitor alive. so
self.manager.revive_osd() will always timeout after calling cot.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index 7f9aa789758..2472f5822e2 100644
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -813,6 +813,7 @@ class ObjectStoreTool:
         self.pool = pool
         self.osd = kwargs.get('osd', None)
         self.object_name = kwargs.get('object_name', None)
+        self.do_revive = kwargs.get('do_revive', True)
         if self.osd and self.pool and self.object_name:
             if self.osd == "primary":
                 self.osd = self.manager.get_object_primary(self.pool,
@@ -867,7 +868,8 @@ class ObjectStoreTool:
                 error = proc.stdout.getvalue() + " " + proc.stderr.getvalue()
                 raise Exception(error)
         finally:
-            self.manager.revive_osd(self.osd)
+            if self.do_revive:
+                self.manager.revive_osd(self.osd)
 
 
 class CephManager: