]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/dashboard : Fixed mirrored image usage info bar
authorAbhishek Desai <abhishek.desai1@ibm.com>
Thu, 7 Aug 2025 07:50:38 +0000 (13:20 +0530)
committerAbhishek Desai <abhishek.desai1@ibm.com>
Thu, 11 Sep 2025 15:09:19 +0000 (20:39 +0530)
fixes : https://tracker.ceph.com/issues/72431

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
(cherry picked from commit 3a192b7c38e3f1669f3deee31702ba802d7411fd)

src/pybind/mgr/dashboard/services/rbd.py

index 31fdb7c9818e3f684eb8c0c39b84cb22f8541276..d7d79b30e65ad6efff9aedb3cf227d2cd3e6e5e1 100644 (file)
@@ -289,7 +289,10 @@ class RbdService(object):
         prev_snap = None
         total_used_size = 0
         for _, size, name in snaps:
-            image.set_snap(name)
+            try:
+                image.set_snap(name)
+            except rbd.ImageNotFound:
+                continue
             du_callb = DUCallback()
             image.diff_iterate(0, size, prev_snap, du_callb,
                                whole_object=whole_object)
@@ -388,10 +391,7 @@ class RbdService(object):
                 stat['snapshots'].append(snap)
 
             # disk usage
-            img_flags = img.flags()
-            if not omit_usage and 'fast-diff' in stat['features_name'] and \
-                    not rbd.RBD_FLAG_FAST_DIFF_INVALID & img_flags and \
-                    mirror_mode != rbd.RBD_MIRROR_IMAGE_MODE_SNAPSHOT:
+            if not omit_usage and 'fast-diff' in stat['features_name']:
                 snaps = [(s['id'], s['size'], s['name'])
                          for s in stat['snapshots']]
                 snaps.sort(key=lambda s: s[0])