Merge pull request ceph#62159 from cbodley/wip-qa-23264

cbodley · web-flow · commit 9e8cc5f92e43 · 2025-04-09T13:03:04.000-04:00
qa/rgw: use storage classes for rgw/crypt

Reviewed-by: Adam Emerson &lt;aemerson@redhat.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -2,7 +2,6 @@ tasks:
 - install:
 - ceph:
 - rgw:
-    storage classes: LUKEWARM, FROZEN
     client.0:
       port: 8000
     client.1:
@@ -49,15 +48,13 @@ tasks:
 - s3tests:
     client.0:
       rgw_server: client.0
-      storage classes: LUKEWARM, FROZEN
       extra_attrs: ["cloud_transition"]
       lc_debug_interval: 10
       lifecycle_tests: True
       cloudtier_tests: True
     #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/crypt/overrides.yaml b/qa/suites/rgw/crypt/overrides.yaml
@@ -1,5 +1,11 @@
 overrides:
+  rgw:
+    compression type: random
+    storage classes:
+      LUKEWARM: [--compression, zlib]
+      FROZEN:
   s3tests:
+    storage classes: LUKEWARM, FROZEN
     accounts:
       iam root: RGW88888888888888888
       iam alt root: RGW99999999999999999
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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),
