From 6afdf860cbb7bb090a164e1b2cca8c05d6e6c8ac Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 5 Mar 2025 16:59:36 -0500 Subject: [PATCH] qa/rgw: storage classes specify extra args in yaml Signed-off-by: Casey Bodley --- qa/suites/rgw/bucket-logging/overrides.yaml | 4 +++- qa/suites/rgw/cloud-transition/overrides.yaml | 5 ++++- .../tasks/restore/cloud_restore_s3tests.yaml | 2 -- .../transition/cloud_transition_s3tests.yaml | 3 --- qa/suites/rgw/lifecycle/overrides.yaml | 4 +++- qa/suites/rgw/lua/overrides.yaml | 4 +++- qa/suites/rgw/multifs/overrides.yaml | 8 ++++++- qa/suites/rgw/notifications/overrides.yaml | 4 +++- qa/suites/rgw/sts/overrides.yaml | 4 +++- qa/suites/rgw/verify/overrides.yaml | 4 +++- qa/tasks/rgw.py | 21 ++++++++----------- 11 files changed, 38 insertions(+), 25 deletions(-) diff --git a/qa/suites/rgw/bucket-logging/overrides.yaml b/qa/suites/rgw/bucket-logging/overrides.yaml index ef08f4616c9f..987cd09f3192 100644 --- a/qa/suites/rgw/bucket-logging/overrides.yaml +++ b/qa/suites/rgw/bucket-logging/overrides.yaml @@ -7,7 +7,9 @@ overrides: debug rgw: 20 rgw bucket logging obj roll time: 5 rgw: - storage classes: LUKEWARM, FROZEN + storage classes: + LUKEWARM: + FROZEN: s3tests: accounts: iam root: RGW88888888888888888 diff --git a/qa/suites/rgw/cloud-transition/overrides.yaml b/qa/suites/rgw/cloud-transition/overrides.yaml index ed7dc40d19b0..b35c134125e6 100644 --- a/qa/suites/rgw/cloud-transition/overrides.yaml +++ b/qa/suites/rgw/cloud-transition/overrides.yaml @@ -13,9 +13,12 @@ overrides: rgw lc debug interval: 10 rgw_restore_debug_interval: 20 rgw: - storage classes: LUKEWARM, FROZEN + storage classes: + LUKEWARM: + FROZEN: frontend: beast s3tests: + storage classes: LUKEWARM, FROZEN accounts: iam root: RGW88888888888888888 iam alt root: RGW99999999999999999 diff --git a/qa/suites/rgw/cloud-transition/tasks/restore/cloud_restore_s3tests.yaml b/qa/suites/rgw/cloud-transition/tasks/restore/cloud_restore_s3tests.yaml index c0c3a02449c3..26b3e70e012f 100644 --- a/qa/suites/rgw/cloud-transition/tasks/restore/cloud_restore_s3tests.yaml +++ b/qa/suites/rgw/cloud-transition/tasks/restore/cloud_restore_s3tests.yaml @@ -2,7 +2,6 @@ tasks: - install: - ceph: - rgw: - storage classes: LUKEWARM, FROZEN client.0: port: 8000 client.1: @@ -25,7 +24,6 @@ tasks: - s3tests: client.0: rgw_server: client.0 - storage classes: LUKEWARM, FROZEN extra_attrs: ["cloud_restore"] lc_debug_interval: 10 rgw_restore_debug_interval: 20 diff --git a/qa/suites/rgw/cloud-transition/tasks/transition/cloud_transition_s3tests.yaml b/qa/suites/rgw/cloud-transition/tasks/transition/cloud_transition_s3tests.yaml index 39023173fcef..1a6c0a74f2db 100644 --- a/qa/suites/rgw/cloud-transition/tasks/transition/cloud_transition_s3tests.yaml +++ b/qa/suites/rgw/cloud-transition/tasks/transition/cloud_transition_s3tests.yaml @@ -2,7 +2,6 @@ tasks: - install: - ceph: - rgw: - storage classes: LUKEWARM, FROZEN client.0: port: 8000 client.1: @@ -49,7 +48,6 @@ tasks: - s3tests: client.0: rgw_server: client.0 - storage classes: LUKEWARM, FROZEN extra_attrs: ["cloud_transition"] lc_debug_interval: 10 lifecycle_tests: True @@ -57,7 +55,6 @@ tasks: #client.2: #force-branch: ceph-master #rgw_server: client.2 - #storage classes: LUKEWARM, FROZEN #extra_attrs: ["cloud_transition"] #lc_debug_interval: 10 #cloudtier_tests: True diff --git a/qa/suites/rgw/lifecycle/overrides.yaml b/qa/suites/rgw/lifecycle/overrides.yaml index 57c376e9dc1f..335b6dcf8349 100644 --- a/qa/suites/rgw/lifecycle/overrides.yaml +++ b/qa/suites/rgw/lifecycle/overrides.yaml @@ -12,7 +12,9 @@ overrides: rgw s3 auth use sts: true rgw lc debug interval: 10 rgw: - storage classes: LUKEWARM, FROZEN + storage classes: + LUKEWARM: + FROZEN: s3tests: accounts: iam root: RGW88888888888888888 diff --git a/qa/suites/rgw/lua/overrides.yaml b/qa/suites/rgw/lua/overrides.yaml index be4b4621542f..ae4da0b17b46 100644 --- a/qa/suites/rgw/lua/overrides.yaml +++ b/qa/suites/rgw/lua/overrides.yaml @@ -6,4 +6,6 @@ overrides: setgroup: ceph debug rgw: 20 rgw: - storage classes: LUKEWARM, FROZEN + storage classes: + LUKEWARM: + FROZEN: diff --git a/qa/suites/rgw/multifs/overrides.yaml b/qa/suites/rgw/multifs/overrides.yaml index 708862b113a5..9e432bc2fd5c 100644 --- a/qa/suites/rgw/multifs/overrides.yaml +++ b/qa/suites/rgw/multifs/overrides.yaml @@ -11,7 +11,13 @@ overrides: rgw sts key: abcdefghijklmnop rgw s3 auth use sts: true rgw: - storage classes: LUKEWARM, FROZEN + storage classes: + LUKEWARM: + - --data-pool + - default.rgw.buckets.data.lukewarm + FROZEN: + - --data-pool + - default.rgw.buckets.data.frozen s3tests: storage classes: LUKEWARM, FROZEN accounts: diff --git a/qa/suites/rgw/notifications/overrides.yaml b/qa/suites/rgw/notifications/overrides.yaml index 00f81003aa6f..ee16ab945734 100644 --- a/qa/suites/rgw/notifications/overrides.yaml +++ b/qa/suites/rgw/notifications/overrides.yaml @@ -14,4 +14,6 @@ overrides: realm: MyRealm zonegroup: MyZoneGroup zone: MyZone - storage classes: LUKEWARM, FROZEN + storage classes: + LUKEWARM: + FROZEN: diff --git a/qa/suites/rgw/sts/overrides.yaml b/qa/suites/rgw/sts/overrides.yaml index fe79f5d39406..a8a1b7772eb8 100644 --- a/qa/suites/rgw/sts/overrides.yaml +++ b/qa/suites/rgw/sts/overrides.yaml @@ -15,7 +15,9 @@ overrides: rgw sts key: abcdefghijklmnop rgw s3 auth use sts: true rgw: - storage classes: LUKEWARM, FROZEN + storage classes: + LUKEWARM: + FROZEN: s3tests: storage classes: LUKEWARM, FROZEN accounts: diff --git a/qa/suites/rgw/verify/overrides.yaml b/qa/suites/rgw/verify/overrides.yaml index afc368fc98c3..ba1f6942d5a2 100644 --- a/qa/suites/rgw/verify/overrides.yaml +++ b/qa/suites/rgw/verify/overrides.yaml @@ -17,7 +17,9 @@ overrides: rgw reshard progress judge interval: 10 rgw: compression type: random - storage classes: LUKEWARM, FROZEN + storage classes: + LUKEWARM: + FROZEN: s3tests: storage classes: LUKEWARM, FROZEN accounts: diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py index 2e44c0bad53f..b6cce36b64b2 100644 --- a/qa/tasks/rgw.py +++ b/qa/tasks/rgw.py @@ -409,30 +409,27 @@ def configure_datacache(ctx, clients, datacache_path): @contextlib.contextmanager def configure_storage_classes(ctx, clients, storage_classes): - """ set a compression type in the default zone placement """ - - sc = [s.strip() for s in storage_classes.split(',')] - + """ create additional storage classes in the default zone placement """ for client in clients: if not ctx.rgw.realm: # XXX: the 'default' zone and zonegroup aren't created until we run RGWRados::init_complete(). # issue a 'radosgw-admin user list' command to trigger this rgwadmin(ctx, client, cmd=['user', 'list'], check_status=True) - for storage_class in sc: - log.info('Configuring storage class type = %s', storage_class) + for name, args in storage_classes.items(): + log.info('Configuring storage class = %s', name) rgwadmin(ctx, client, cmd=['zonegroup', 'placement', 'add', '--rgw-zone', ctx.rgw.zone, '--placement-id', 'default-placement', - '--storage-class', storage_class], + '--storage-class', name], check_status=True) rgwadmin(ctx, client, cmd=['zone', 'placement', 'add', '--rgw-zone', ctx.rgw.zone, '--placement-id', 'default-placement', - '--storage-class', storage_class, - '--data-pool', 'default.rgw.buckets.data.' + storage_class.lower()], + '--storage-class', name, + '--data-pool', 'default.rgw.buckets.data.' + name.lower()] + (args or []), check_status=True) yield @@ -506,7 +503,7 @@ def task(ctx, config): ctx.rgw.frontend = config.pop('frontend', 'beast') ctx.rgw.compression_type = config.pop('compression type', None) ctx.rgw.inline_data = config.pop('inline data', True) - ctx.rgw.storage_classes = config.pop('storage classes', None) + storage_classes = config.pop('storage classes', None) default_cert = config.pop('ssl certificate', None) ctx.rgw.data_pool_pg_size = config.pop('data_pool_pg_size', 64) ctx.rgw.index_pool_pg_size = config.pop('index_pool_pg_size', 64) @@ -543,10 +540,10 @@ def task(ctx, config): lambda: configure_datacache(ctx=ctx, clients=clients, datacache_path=ctx.rgw.datacache_path), ]) - if ctx.rgw.storage_classes: + if storage_classes: subtasks.extend([ lambda: configure_storage_classes(ctx=ctx, clients=clients, - storage_classes=ctx.rgw.storage_classes), + storage_classes=storage_classes), ]) subtasks.extend([ lambda: start_rgw(ctx=ctx, config=config, clients=clients), -- 2.47.3