From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 27 Jul 2021 15:20:08 +0000 (+0200)
Subject: pybind/rbd: actually append site_status dict to remote_statuses
X-Git-Tag: v15.2.15~45^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=34269e74206ea4b4e00ac6d73a514cc300345f2f;p=ceph.git

pybind/rbd: actually append site_status dict to remote_statuses

Using += operator is wrong -- only site_status keys get appended
(and repeatedly at that in case there is more than one remote site
as the keys are added one by one).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 89888beb1266be5a661fef8643bb6bef0c720f5f)
---

diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
index a231d56f19487..de2b5d3c3fa1b 100644
--- a/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@ -2868,7 +2868,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),
@@ -5207,7 +5207,7 @@ written." % (self.name, ret, length))
                     local_status = site_status
                 else:
                     site_status['mirror_uuid'] = mirror_uuid
-                    site_statuses += site_status
+                    site_statuses.append(site_status)
             status = {
                 'name': decode_cstr(c_status.name),
                 'id'  : self.id(),