From: Warren Usui <wusui@redhat.com>
Date: Wed, 25 May 2016 23:59:05 +0000 (-0700)
Subject: tasks/ceph.restart osd fix
X-Git-Tag: v11.1.1~58^2^2~186^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b7552c9cb331978cb0bfd4d7dc4dcde4186c176;p=ceph.git

tasks/ceph.restart osd fix

ceph.restart should mark restarted osds down in order to avoid a
race condition with ceph_manager.wait_for_clean

Fixes: http://tracker.ceph.com/issues/15778
Signed-off-by: Warren Usui <wusui@redhat.com>
---

diff --git a/tasks/ceph.py b/tasks/ceph.py
index 114f25b33cb4..43735bea620c 100644
--- a/tasks/ceph.py
+++ b/tasks/ceph.py
@@ -1214,6 +1214,13 @@ def restart(ctx, config):
     if config.get('wait-for-osds-up', False):
         for cluster in clusters:
             wait_for_osds_up(ctx=ctx, config=dict(cluster=cluster))
+    manager = ctx.managers['ceph']
+    for dmon in daemons:
+        if '.' in dmon:
+            dm_parts = dmon.split('.')
+            if dm_parts[1].isdigit():
+                if dm_parts[0] == 'osd':
+                    manager.mark_down_osd(int(dm_parts[1]))
     yield