From: David Zafman <dzafman@redhat.com>
Date: Thu, 18 Aug 2016 16:03:52 +0000 (-0700)
Subject: revive_osd: Suppress output used to wait for OSD to be fully started
X-Git-Tag: v11.1.1~58^2^2~125^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d52d10898436143ddc4aa0ea93c0a5faa0f9910;p=ceph.git

revive_osd: Suppress output used to wait for OSD to be fully started

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index c2c5fb7a27b..70a1efbae0d 100644
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -1174,7 +1174,7 @@ class CephManager:
             '0')
 
     def wait_run_admin_socket(self, service_type,
-                              service_id, args=['version'], timeout=75):
+                              service_id, args=['version'], timeout=75, stdout=StringIO()):
         """
         If osd_admin_socket call suceeds, return.  Otherwise wait
         five seconds and try again.
@@ -1182,7 +1182,7 @@ class CephManager:
         tries = 0
         while True:
             proc = self.admin_socket(service_type, service_id,
-                                     args, check_status=False)
+                                     args, check_status=False, stdout=stdout)
             if proc.exitstatus is 0:
                 break
             else:
@@ -1945,7 +1945,7 @@ class CephManager:
             # unhappy.  see #5924.
             self.wait_run_admin_socket('osd', osd,
                                        args=['dump_ops_in_flight'],
-                                       timeout=timeout)
+                                       timeout=timeout, stdout=DEVNULL)
 
     def mark_down_osd(self, osd):
         """