From: Douglas Fuller <dfuller@redhat.com>
Date: Wed, 5 Jul 2017 18:49:50 +0000 (-0400)
Subject: ceph.in: Check return value when connecting
X-Git-Tag: v12.1.1~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fee8ea8bccb3e5960640337874006adf310e4629;p=ceph.git

ceph.in: Check return value when connecting

The initial RADOS connection may time out. Detect this condition
and return an error message to the user instead of looping forever.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index a17a4cd4b23..96533520dad 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -899,7 +899,10 @@ def main():
     try:
         if childargs and childargs[0] == 'ping':
             return ping_monitor(cluster_handle, childargs[1], timeout)
-        run_in_thread(cluster_handle.connect, timeout=timeout)
+        result = run_in_thread(cluster_handle.connect, timeout=timeout)
+        if type(result) is tuple and result[0] == -errno.EINTR:
+            print('Cluster connection interrupted or timed out', file=sys.stderr)
+            return 1
     except KeyboardInterrupt:
         print('Cluster connection aborted', file=sys.stderr)
         return 1