From: David Zafman <dzafman@redhat.com>
Date: Tue, 12 Apr 2016 16:27:33 +0000 (-0700)
Subject: ceph_manager: Add timeout to admin_socket/osd_admin_socket
X-Git-Tag: v0.94.10~27^2^2~5^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7c87ae74a7f3f3c0096fe6cfe36e1077f96ea1f;p=ceph.git

ceph_manager: Add timeout to admin_socket/osd_admin_socket

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 4ad3b866041a3a5391f46cd3d96297834b95956b)
---

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index 71722232f71..366ab327dfb 100644
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -889,8 +889,8 @@ class CephManager:
                 ]
             )
 
-    def osd_admin_socket(self, osd_id, command, check_status=True):
-        return self.admin_socket('osd', osd_id, command, check_status)
+    def osd_admin_socket(self, osd_id, command, check_status=True, timeout=0):
+        return self.admin_socket('osd', osd_id, command, check_status, timeout)
 
     def find_remote(self, service_type, service_id):
         """
@@ -911,7 +911,7 @@ class CephManager:
                                                           service_id))
 
     def admin_socket(self, service_type, service_id,
-                     command, check_status=True):
+                     command, check_status=True, timeout=0):
         """
         Remotely start up ceph specifying the admin socket
         :param command: a list of words to use as the command
@@ -924,6 +924,8 @@ class CephManager:
             'adjust-ulimits',
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
+            'timeout',
+            str(timeout),
             'ceph',
             '--admin-daemon',
             '/var/run/ceph/ceph-{type}.{id}.asok'.format(