From db88e7f385f4464f5f4de517845607391c314ef5 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Tue, 18 Feb 2014 13:07:32 -0800 Subject: [PATCH] ceph_rest_api.py: don't fail if no up OSDs found on startup allow find_up_osd() to return None, and have caller check for it Fixes: #7463 Signed-off-by: Dan Mick --- src/pybind/ceph_rest_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/ceph_rest_api.py b/src/pybind/ceph_rest_api.py index 75e61060544c..46d971edb2f2 100755 --- a/src/pybind/ceph_rest_api.py +++ b/src/pybind/ceph_rest_api.py @@ -56,7 +56,7 @@ def find_up_osd(app): raise EnvironmentError(errno.EINVAL, 'Invalid JSON back from osd dump') osds = [osd['osd'] for osd in osddump['osds'] if osd['up']] if not osds: - raise EnvironmentError(errno.ENOENT, 'No up OSDs found') + return None return int(osds[-1]) @@ -139,7 +139,7 @@ def api_setup(app, conf, cluster, clientname, clientid, args): app.ceph_sigdict = get_command_descriptions(app.ceph_cluster) osdid = find_up_osd(app) - if osdid: + if osdid is not None: osd_sigdict = get_command_descriptions(app.ceph_cluster, target=('osd', int(osdid))) -- 2.47.3