Merge pull request #635 from ckulal/bucket_check_tfa

Fix bucket check fix failure in squid
red-hat-storage · Sep 25, 2024 · 3016c3d · 3016c3d
2 parents f4808bf + a805410
commit 3016c3d
Showing 1 changed file with 22 additions and 14 deletions.
diff --git a/rgw/v2/tests/s3_swift/test_Mbuckets_with_Nobjects.py b/rgw/v2/tests/s3_swift/test_Mbuckets_with_Nobjects.py
@@ -759,13 +759,17 @@ def test_exec(config, ssh_con):
                         bkt_check_before = utils.exec_shell_cmd(cmd)
                         bkt_check_before = json.loads(bkt_check_before)
                         if (
-                            float(ceph_version_id[0]) == 17
-                            and float(ceph_version_id[1]) >= 2
-                            and float(ceph_version_id[2]) >= 6
-                        ) or (
-                            float(ceph_version_id[0]) == 18
-                            and float(ceph_version_id[1]) >= 2
-                            and float(ceph_version_id[2]) >= 1
+                            (
+                                float(ceph_version_id[0]) == 17
+                                and float(ceph_version_id[1]) >= 2
+                                and float(ceph_version_id[2]) >= 6
+                            )
+                            or (
+                                float(ceph_version_id[0]) == 18
+                                and float(ceph_version_id[1]) >= 2
+                                and float(ceph_version_id[2]) >= 1
+                            )
+                            or float(ceph_version_id[0]) >= 19
                         ):
                             log.info("validating orphaned object as per new format")
                             if len(bkt_check_before["invalid_multipart_entries"]) < 1:
@@ -785,13 +789,17 @@ def test_exec(config, ssh_con):
                         bkt_check_after = json.loads(bkt_check_after)
                         log.info(f"o/p of bucket check after fix: {bkt_check_after}")
                         if (
-                            float(ceph_version_id[0]) == 17
-                            and float(ceph_version_id[1]) >= 2
-                            and float(ceph_version_id[2]) >= 6
-                        ) or (
-                            float(ceph_version_id[0]) == 18
-                            and float(ceph_version_id[1]) >= 2
-                            and float(ceph_version_id[2]) >= 1
+                            (
+                                float(ceph_version_id[0]) == 17
+                                and float(ceph_version_id[1]) >= 2
+                                and float(ceph_version_id[2]) >= 6
+                            )
+                            or (
+                                float(ceph_version_id[0]) == 18
+                                and float(ceph_version_id[1]) >= 2
+                                and float(ceph_version_id[2]) >= 1
+                            )
+                            or float(ceph_version_id[0]) >= 19
                         ):
                             log.info("validating bucket check as per new format")
                             if len(bkt_check_after["invalid_multipart_entries"]) != 0: