RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-18 17:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph.in: Check return value when connecting

Browse Source 
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>
This commit is contained in:
Douglas Fuller 2017-07-05 14:49:50 -04:00
parent 1174a2fbab
commit fee8ea8bcc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ceph.in
View File

@ -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