update ceph source to reef 18.1.2

[ceph.git] / ceph / qa / tasks / rgw.py

diff --git a/ceph/qa/tasks/rgw.py b/ceph/qa/tasks/rgw.py
index a10266d050e28f8652397304f199a8b61ed75ac7..61bcea3a5e2e5db78a99a88282eab84b977ef6fc 100644 (file)
--- a/ceph/qa/tasks/rgw.py
+++ b/ceph/qa/tasks/rgw.py
@@ -314,6 +314,20 @@ def configure_compression(ctx, clients, compression):
                 check_status=True)
     yield
 
+@contextlib.contextmanager
+def disable_inline_data(ctx, clients):
+    for client in clients:
+        # 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)
+
+        rgwadmin(ctx, client,
+                cmd=['zone', 'placement', 'modify', '--rgw-zone', 'default',
+                     '--placement-id', 'default-placement',
+                     '--placement-inline-data', 'false'],
+                check_status=True)
+    yield
+
 @contextlib.contextmanager
 def configure_datacache(ctx, clients, datacache_path):
     """ create directory for rgw datacache """
@@ -414,6 +428,7 @@ def task(ctx, config):
     ctx.rgw.cache_pools = bool(config.pop('cache-pools', False))
     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)
     default_cert = config.pop('ssl certificate', None)
     ctx.rgw.data_pool_pg_size = config.pop('data_pool_pg_size', 64)
@@ -435,6 +450,10 @@ def task(ctx, config):
             lambda: configure_compression(ctx=ctx, clients=clients,
                                           compression=ctx.rgw.compression_type),
         ])
+    if not ctx.rgw.inline_data:
+        subtasks.extend([
+            lambda: disable_inline_data(ctx=ctx, clients=clients),
+        ])
     if ctx.rgw.datacache:
         subtasks.extend([
             lambda: configure_datacache(ctx=ctx, clients=clients,