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

ceph_rest_api.py: don't fail if no up OSDs found on startup

Browse Source 
allow find_up_osd() to return None, and have caller check for it

Fixes: #7463
Signed-off-by: Dan Mick <dan.mick@inktank.com>
This commit is contained in:
Dan Mick 2014-02-18 13:07:32 -08:00
parent 6d4c1e2b42
commit db88e7f385
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pybind/ceph_rest_api.py
View File

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