]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
revive_osd: Suppress output used to wait for OSD to be fully started
authorDavid Zafman <dzafman@redhat.com>
Thu, 18 Aug 2016 16:03:52 +0000 (09:03 -0700)
committerDavid Zafman <dzafman@redhat.com>
Fri, 19 Aug 2016 04:10:54 +0000 (21:10 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
tasks/ceph_manager.py

index c2c5fb7a27bbbe6caf1781269884010bd1890b4a..70a1efbae0d9734fbed7e52d2e5463de0a84caf0 100644 (file)
@@ -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):
         """