summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Mick <dan.mick@inktank.com>2013-07-16 22:14:15 -0700
committerDan Mick <dan.mick@inktank.com>2013-07-19 15:01:18 -0700
commitce46961e32c8d9a517897847d3c14e42737cb11f (patch)
tree2e0fc231d331fbad7e1939648f966f33872eb560
parentd3902e2e31574f4e91e2932c6ed7b06e6a6c7014 (diff)
downloadceph-ce46961e32c8d9a517897847d3c14e42737cb11f.tar.gz
ceph.in: better error message when daemon command returns nothing
Fixes: #5683 signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
-rwxr-xr-xsrc/ceph.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ceph.in b/src/ceph.in
index 0f7179b8aed..6ba92c99b18 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -290,6 +290,8 @@ def admin_socket(asok_path, cmd):
sock.sendall(' '.join(cmd) + '\0')
len_str = sock.recv(4)
+ if len(len_str) < 4:
+ raise RuntimeError("no data returned from admin socket")
l, = struct.unpack(">I", len_str)
ret = ''