From: Dan Mick <dan.mick@inktank.com>
Date: Tue, 4 Jun 2013 23:39:13 +0000 (-0700)
Subject: ceph: Remove connect/command timeouts; too risky for now
X-Git-Tag: v0.65~136^2^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=115bb9332b1906f0bccddfaf2c1e9678f9be7efe;p=ceph.git

ceph: Remove connect/command timeouts; too risky for now
Keep 10s timeout when connecting for help descriptions, however

Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/src/ceph b/src/ceph
index e5b67f6e7b87..a19fae159b81 100755
--- a/src/ceph
+++ b/src/ceph
@@ -842,7 +842,8 @@ def do_help(parser, help_all = False):
 
     def help_for_target(target):
         ret, outbuf, outs = json_command(target=target,
-                                         prefix='get_command_descriptions')
+                                         prefix='get_command_descriptions', 
+                                         timeout=10)
         if ret:
             print >> sys.stderr, \
                 "couldn't get command descriptions for {0}: {1}".\
@@ -1049,7 +1050,7 @@ def validate_command(parsed_args, sigdict, args):
         return valid_dict
 
 def json_command(target=('mon', ''), prefix=None, argdict=None, inbuf='',
-                 timeout=30):
+                 timeout=0):
     """
     Send a new_style command to a daemon using librados's
     mon_command, osd_command, or pg_command.  Prefix may be supplied
@@ -1350,7 +1351,7 @@ def main():
         childargs.remove('--')
 
     try:
-        cluster.connect(timeout=15)
+        cluster.connect()
     except KeyboardInterrupt:
         print >> sys.stderr, "connection aborted"
         return 1