RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42471 from Dorthu/fix-pybind-rbd-mirror-image-get-status

Browse Source 
pybind/rbd: fix mirror_image_get_status

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2021-08-02 22:04:04 +02:00 committed by GitHub
commit 76294e57f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pybind/rbd/rbd.pyx
View File

@ -2270,7 +2270,7 @@ cdef class MirrorImageStatusIterator(object):
local_status = site_status
else:
site_status['mirror_uuid'] = mirror_uuid
site_statuses += site_status
site_statuses.append(site_status)
status = {
'name' : decode_cstr(self.images[i].name),
@ -2278,6 +2278,8 @@ cdef class MirrorImageStatusIterator(object):
'info' : {
'global_id' : decode_cstr(self.images[i].info.global_id),
'state' : self.images[i].info.state,
# primary isn't added here because it is unknown (always
# false, see XXX in Mirror::image_global_status_list())
},
'remote_statuses': site_statuses,
}
@ -4642,8 +4644,8 @@ written." % (self.name, ret, length))
if mirror_uuid == '':
local_status = site_status
else:
site_statuses['mirror_uuid'] = mirror_uuid
site_statuses += site_status
site_status['mirror_uuid'] = mirror_uuid
site_statuses.append(site_status)
status = {
'name': decode_cstr(c_status.name),
'id' : self.id(),