test CEPH-83581977 and TFA fix for IBM cos and multipart access at ar…

…chive Signed-off-by: Vidushi Mishra <[email protected]>
red-hat-storage · Jun 27, 2024 · 8031852 · 8031852
1 parent 7bb5533
commit 8031852
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/...ts/s3_swift/multisite_configs/test_sse_s3_bucket_enc_multipart_download_archive_site.yaml b/...ts/s3_swift/multisite_configs/test_sse_s3_bucket_enc_multipart_download_archive_site.yaml
@@ -17,6 +17,6 @@ config:
   enable_version: false
   sse_s3_per_bucket: true
   upload_type: multipart
-  delete_bucket_object: true
+  delete_bucket_object: false
   delete_bucket_object_version: false
   download_object_at_remote_site: true
diff --git a/rgw/v2/tests/s3_swift/reusable.py b/rgw/v2/tests/s3_swift/reusable.py
@@ -1685,6 +1685,19 @@ def prepare_for_bucket_lc_transition(config):
                 utils.exec_shell_cmd(
                     f"radosgw-admin zonegroup placement add  --rgw-zonegroup {zonegroup} --placement-id default-placement --storage-class CLOUDIBM --tier-type=cloud-s3 --tier-config=endpoint={endpoint},access_key={access},secret={secret},target_path={target_path},multipart_sync_threshold=44432,multipart_min_part_size=44432,retain_head_object=false,region=au-syd"
                 )
+            utils.exec_shell_cmd(
+                "radosgw-admin zone placement modify --rgw-zone primary --placement-id default-placement  --compression zlib"
+            )
+            utils.exec_shell_cmd(
+                "ceph config set client.rgw.shared.pri rgw_crypt_default_encryption_key 4YSmvJtBv0aZ7geVgAsdpRnLBEwWSWlMIGnRS8a9TSA="
+            )
+            remote_site_ssh_con = get_remote_conn_in_multisite()
+            remote_site_ssh_con.exec_command(
+                "radosgw-admin zone placement modify --rgw-zone primary --placement-id default-placement  --compression zlib"
+            )
+            remote_site_ssh_con.exec_command(
+                "ceph config set client.rgw.shared.sec rgw_crypt_default_encryption_key 4YSmvJtBv0aZ7geVgAsdpRnLBEwWSWlMIGnRS8a9TSA="
+            )
         else:
             target_path = "aws-bucket-01"
             utils.exec_shell_cmd(
@@ -1700,6 +1713,23 @@ def prepare_for_bucket_lc_transition(config):
                 )
     if is_multisite:
         utils.exec_shell_cmd("radosgw-admin period update --commit")
+        if config.test_ops.get("test_ibm_cloud_transition", False):
+            utils.exec_shell_cmd(
+                "radosgw-admin zone placement modify --rgw-zone primary --placement-id default-placement  --compression zlib"
+            )
+            utils.exec_shell_cmd(
+                "ceph config set client.rgw.shared.pri rgw_crypt_default_encryption_key 4YSmvJtBv0aZ7geVgAsdpRnLBEwWSWlMIGnRS8a9TSA="
+            )
+            utils.exec_shell_cmd("ceph orch restart rgw.shared.pri")
+            remote_site_ssh_con = get_remote_conn_in_multisite()
+            # Test IBM COS with compression and encryption CEPH-83581977
+            remote_site_ssh_con.exec_command(
+                "radosgw-admin zone placement modify --rgw-zone primary --placement-id default-placement  --compression zlib"
+            )
+            remote_site_ssh_con.exec_command(
+                "ceph config set client.rgw.shared.sec rgw_crypt_default_encryption_key 4YSmvJtBv0aZ7geVgAsdpRnLBEwWSWlMIGnRS8a9TSA="
+            )
+            remote_site_ssh_con.exec_command("ceph orch restart rgw.shared.sec")
 
 
 def bucket_reshard_manual(bucket, config):

diff --git a/rgw/v2/tests/s3_swift/test_sse_s3_kms_with_vault.py b/rgw/v2/tests/s3_swift/test_sse_s3_kms_with_vault.py
@@ -227,7 +227,7 @@ def test_exec(config, ssh_con):
                         )
     # check sync status if a multisite cluster
     reusable.check_sync_status()
-
+    reusable.remove_user(each_user)
     # check for any crashes during the execution
     crash_info = reusable.check_for_crash()
     if crash_info: