From: Sage Weil <sage@newdream.net>
Date: Thu, 13 Jul 2017 14:46:10 +0000 (-0500)
Subject: Merge pull request #16130 from fullerdj/wip-djf-ceph-connect-timeout
X-Git-Tag: v12.1.1~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c67f986b8302019b784307baca0a1cc903719a65;p=ceph.git

Merge pull request #16130 from fullerdj/wip-djf-ceph-connect-timeout

ceph.in: Check return value when connecting

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
---

c67f986b8302019b784307baca0a1cc903719a65
diff --cc src/ceph.in
index c9bef561e45,96533520dad..6a6672a8592
--- a/src/ceph.in
+++ b/src/ceph.in
@@@ -894,9 -897,12 +894,12 @@@ def main()
          # for completion let timeout be really small
          timeout = 3
      try:
 -        if childargs and childargs[0] == 'ping':
 +        if childargs and childargs[0] == 'ping' and not parsed_args.help:
              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