From c7843e5d8ffa6eff1bde24837478a2f77b4ca8b3 Mon Sep 17 00:00:00 2001 From: Vidushi Mishra Date: Thu, 27 Jun 2024 14:30:24 +0530 Subject: [PATCH] CEPH-83581977 and TFA fixes Signed-off-by: Vidushi Mishra --- ...test_lc_cloud_transition_ibm_retain_false.yaml | 2 +- rgw/v2/tests/s3_swift/reusable.py | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/rgw/v2/tests/s3_swift/multisite_configs/test_lc_cloud_transition_ibm_retain_false.yaml b/rgw/v2/tests/s3_swift/multisite_configs/test_lc_cloud_transition_ibm_retain_false.yaml index 2a39278dd..06271eb16 100644 --- a/rgw/v2/tests/s3_swift/multisite_configs/test_lc_cloud_transition_ibm_retain_false.yaml +++ b/rgw/v2/tests/s3_swift/multisite_configs/test_lc_cloud_transition_ibm_retain_false.yaml @@ -1,5 +1,5 @@ #test_bucket_lifecycle_object_expiration_transition.py -#CEPH-83581973,CEPH-83581975 +#CEPH-83581973,CEPH-83581975, CEPH-83581977 config: user_count: 1 bucket_count: 1 diff --git a/rgw/v2/tests/s3_swift/reusable.py b/rgw/v2/tests/s3_swift/reusable.py index a05d2f890..8105d423c 100644 --- a/rgw/v2/tests/s3_swift/reusable.py +++ b/rgw/v2/tests/s3_swift/reusable.py @@ -1685,19 +1685,6 @@ 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( @@ -1714,6 +1701,7 @@ 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): + # CEPH-83581977, test cloud transition of encrypted and compressed objects utils.exec_shell_cmd( "radosgw-admin zone placement modify --rgw-zone primary --placement-id default-placement --compression zlib" ) @@ -1722,7 +1710,6 @@ def prepare_for_bucket_lc_transition(config): ) 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" )