increased client count

diff --git a/qa/suites/rgw/multiclient/clusters/4-node-bluestore.yaml b/qa/suites/rgw/multiclient/clusters/4-node-bluestore.yaml
index ddc465e4b6e8d9475c42887fccbae1c90c5b6b38..23bc1fafbe001b2202dc806c18abcf2cf73aa938 100644 (file)
--- a/qa/suites/rgw/multiclient/clusters/4-node-bluestore.yaml
+++ b/qa/suites/rgw/multiclient/clusters/4-node-bluestore.yaml
@@ -33,3 +33,7 @@ roles:
   - client.0
 - - rgw.1
   - client.1
+- - rgw.2
+  - client.2
+- - rgw.3
+  - client.3

diff --git a/qa/suites/rgw/multiclient/clusters/4-node.yaml b/qa/suites/rgw/multiclient/clusters/4-node.yaml
index 1e959a75f9063d30e4ed4bc66b7873bb4a5adcb0..b0100a7c0a575eb4d8ba9e96dc3d18f8bd62f51b 100644 (file)
--- a/qa/suites/rgw/multiclient/clusters/4-node.yaml
+++ b/qa/suites/rgw/multiclient/clusters/4-node.yaml
@@ -32,3 +32,7 @@ roles:
   - client.0
 - - rgw.1
   - client.1
+- - rgw.2
+  - client.2
+- - rgw.3
+  - client.3

diff --git a/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects.yaml b/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects.yaml
index f97fa1d70075f540b29b9a9091fd5dce937259d1..7c44c32cc494e67ac52fa02135bbb149643ce995 100644 (file)
--- a/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects.yaml
+++ b/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects.yaml
@@ -30,6 +30,50 @@ tasks:
           test: Mbuckets_with_Nobjects
           script: test_Mbuckets_with_Nobjects.py
           clients: [client.1]
+          config:
+            user_count: 5
+            bucket_count: 5
+            objects_count: 10
+            objects_size_range:
+              min: 100
+              max: 200
+            test_ops:
+              create_bucket: true
+              create_object: true
+              download_object: true
+              delete_bucket_object: true
+              sharding:
+                enable: false
+                max_shards: 0
+              compression:
+                enable: false
+                type: zlib
+      - rgw-system-test:
+          test: Mbuckets_with_Nobjects
+          script: test_Mbuckets_with_Nobjects.py
+          clients: [client.2]
+          config:
+            user_count: 5
+            bucket_count: 5
+            objects_count: 10
+            objects_size_range:
+              min: 100
+              max: 200
+            test_ops:
+              create_bucket: true
+              create_object: true
+              download_object: true
+              delete_bucket_object: true
+              sharding:
+                enable: false
+                max_shards: 0
+              compression:
+                enable: false
+                type: zlib
+      - rgw-system-test:
+          test: Mbuckets_with_Nobjects
+          script: test_Mbuckets_with_Nobjects.py
+          clients: [client.3]
           config:
             user_count: 5
             bucket_count: 5

diff --git a/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects_multipart.yaml b/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects_multipart.yaml
index 5138ffc7d58916bb339769de0dbb9cb90e7faf38..538bb8b95eb1da5c59c30cb2f1d6e86523eb0683 100644 (file)
--- a/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects_multipart.yaml
+++ b/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects_multipart.yaml
@@ -43,6 +43,53 @@ tasks:
               create_object: true
               download_object: true
               delete_bucket_object: true
+              upload_type: multipart
+              sharding:
+                enable: false
+                max_shards: 0
+              compression:
+                enable: false
+                type: zlib
+      - rgw-system-test:
+          test: Mbuckets_with_Nobjects_muktipart
+          script: test_Mbuckets_with_Nobjects.py
+          clients: [client.2]
+          config:
+            user_count: 2
+            bucket_count: 5
+            objects_count: 10
+            objects_size_range:
+              min: 1000
+              max: 1500
+            test_ops:
+              create_bucket: true
+              create_object: true
+              download_object: true
+              delete_bucket_object: true
+              upload_type: multipart
+              sharding:
+                enable: false
+                max_shards: 0
+              compression:
+                enable: false
+                type: zlib
+      - rgw-system-test:
+          test: Mbuckets_with_Nobjects_muktipart
+          script: test_Mbuckets_with_Nobjects.py
+          clients: [client.3]
+          config:
+            user_count: 2
+            bucket_count: 5
+            objects_count: 10
+            objects_size_range:
+              min: 1000
+              max: 1500
+            test_ops:
+              create_bucket: true
+              create_object: true
+              download_object: true
+              delete_bucket_object: true
+              upload_type: multipart
               sharding:
                 enable: false
                 max_shards: 0

diff --git a/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects_sharding.yaml b/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects_sharding.yaml
index bf3cb0c1dba8d9530b6abbe19b7707e2ccdc78f1..1748eb93b7263cf59295939099a674bc66be1d34 100644 (file)
--- a/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects_sharding.yaml
+++ b/qa/suites/rgw/multiclient/tasks/Mbuckets_with_Nobjects_sharding.yaml
@@ -30,6 +30,50 @@ tasks:
           test: Mbuckets_with_Nobjects
           script: test_Mbuckets_with_Nobjects.py
           clients: [client.1]
+          config:
+            user_count: 5
+            bucket_count: 5
+            objects_count: 10
+            objects_size_range:
+              min: 100
+              max: 200
+            test_ops:
+              create_bucket: true
+              create_object: true
+              download_object: true
+              delete_bucket_object: true
+              sharding:
+                enable: true
+                max_shards: 32
+              compression:
+                enable: false
+                type: zlib
+      - rgw-system-test:
+          test: Mbuckets_with_Nobjects
+          script: test_Mbuckets_with_Nobjects.py
+          clients: [client.2]
+          config:
+            user_count: 5
+            bucket_count: 5
+            objects_count: 10
+            objects_size_range:
+              min: 100
+              max: 200
+            test_ops:
+              create_bucket: true
+              create_object: true
+              download_object: true
+              delete_bucket_object: true
+              sharding:
+                enable: true
+                max_shards: 32
+              compression:
+                enable: false
+                type: zlib
+      - rgw-system-test:
+          test: Mbuckets_with_Nobjects
+          script: test_Mbuckets_with_Nobjects.py
+          clients: [client.3]
           config:
             user_count: 5
             bucket_count: 5

diff --git a/qa/suites/rgw/multiclient/tasks/swift_basic_ops.yaml b/qa/suites/rgw/multiclient/tasks/swift_basic_ops.yaml
index 01b65720fad89b856de876da9623dd23bab8927d..d8efc933c2fd48fdfab330fba833ed929eb07efe 100644 (file)
--- a/qa/suites/rgw/multiclient/tasks/swift_basic_ops.yaml
+++ b/qa/suites/rgw/multiclient/tasks/swift_basic_ops.yaml
@@ -23,3 +23,23 @@ tasks:
            objects_size_range:
             min: 50
             max: 60
+      - rgw-system-test:
+          test: swift_basic_ops
+          script: test_swift_basic_ops.py
+          client: [client.2]
+          config:
+            container_count: 10
+            objects_count: 10
+            objects_size_range:
+              min: 50
+              max: 60
+      - rgw-system-test:
+          test: swift_basic_ops
+          script: test_swift_basic_ops.py
+          client: [client.3]
+          config:
+            container_count: 10
+            objects_count: 10
+            objects_size_range:
+              min: 50
+              max: 60

diff --git a/qa/suites/rgw/multiclient/tasks/versioning_ops.yaml b/qa/suites/rgw/multiclient/tasks/versioning_ops.yaml
index ba6c9752513bb3cb7ffb2afdbe7a006d0a37d3ea..a3c340e5b9cfa39f47d96bee54f3eeba234406a9 100644 (file)
--- a/qa/suites/rgw/multiclient/tasks/versioning_ops.yaml
+++ b/qa/suites/rgw/multiclient/tasks/versioning_ops.yaml
@@ -25,6 +25,42 @@ tasks:
           test: versioning_ops
           script: test_versioning_with_objects.py
           clients: [client.1]
+          config:
+            user_count: 2
+            bucket_count: 2
+            objects_count: 10
+            version_count: 5
+            objects_size_range:
+              min: 50
+              max: 80
+            test_ops:
+              enable_version: true
+              suspend_version: true
+              copy_to_version: false
+              delete_object_versions: false
+              upload_after_suspend: true
+      - rgw-system-test:
+          test: versioning_ops
+          script: test_versioning_with_objects.py
+          clients: [client.2]
+          config:
+            user_count: 2
+            bucket_count: 2
+            objects_count: 10
+            version_count: 5
+            objects_size_range:
+              min: 50
+              max: 80
+            test_ops:
+              enable_version: true
+              suspend_version: true
+              copy_to_version: false
+              delete_object_versions: false
+              upload_after_suspend: true
+      - rgw-system-test:
+          test: versioning_ops
+          script: test_versioning_with_objects.py
+          clients: [client.3]
           config:
             user_count: 2
             bucket_count: 2