From: Sage Weil <sage@redhat.com>
Date: Thu, 31 Aug 2017 18:55:46 +0000 (-0400)
Subject: qa/tasks/ceph_manager: revive osds before doing final rerr reset
X-Git-Tag: v13.0.1~1067^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=21027233b2a31b587e7caf95b1d85f5bcf0ae8ec;p=ceph-ci.git

qa/tasks/ceph_manager: revive osds before doing final rerr reset

We assume below that rerrosd is up, but it may not be when we exit the
loop.

Fixes: http://tracker.ceph.com/issues/21206
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index b2f687e49bb..9da03bdd908 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -1031,6 +1031,7 @@ class Thrasher:
                         Scrubber(self.ceph_manager, self.config)
             self.choose_action()()
             time.sleep(delay)
+        self.all_up()
         if self.random_eio > 0:
             self.ceph_manager.raw_cluster_cmd('tell', 'osd.'+str(self.rerrosd),
                           'injectargs', '--', '--filestore_debug_random_read_err=0.0')