diff --git a/qa/suites/rgw/multifs/overrides.yaml b/qa/suites/rgw/multifs/overrides.yaml index bc1e82e9b86..9b2063f0699 100644 --- a/qa/suites/rgw/multifs/overrides.yaml +++ b/qa/suites/rgw/multifs/overrides.yaml @@ -3,5 +3,3 @@ overrides: conf: client: debug rgw: 20 - rgw: - frontend: civetweb diff --git a/qa/suites/rgw/thrash/% b/qa/suites/rgw/thrash/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/rgw/thrash/civetweb.yaml b/qa/suites/rgw/thrash/civetweb.yaml new file mode 100644 index 00000000000..5845a0e6c15 --- /dev/null +++ b/qa/suites/rgw/thrash/civetweb.yaml @@ -0,0 +1,3 @@ +overrides: + rgw: + frontend: civetweb diff --git a/qa/suites/rgw/thrash/clusters/fixed-2.yaml b/qa/suites/rgw/thrash/clusters/fixed-2.yaml new file mode 120000 index 00000000000..cd0791a1486 --- /dev/null +++ b/qa/suites/rgw/thrash/clusters/fixed-2.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/rgw/thrash/install.yaml b/qa/suites/rgw/thrash/install.yaml new file mode 100644 index 00000000000..84a1d70cfba --- /dev/null +++ b/qa/suites/rgw/thrash/install.yaml @@ -0,0 +1,5 @@ +tasks: +- install: +- ceph: +- rgw: [client.0] + diff --git a/qa/suites/rgw/thrash/objectstore b/qa/suites/rgw/thrash/objectstore new file mode 120000 index 00000000000..4c8ebadfde8 --- /dev/null +++ b/qa/suites/rgw/thrash/objectstore @@ -0,0 +1 @@ +../../../objectstore \ No newline at end of file diff --git a/qa/suites/rgw/thrash/thrasher/default.yaml b/qa/suites/rgw/thrash/thrasher/default.yaml new file mode 100644 index 00000000000..d880d53b7d3 --- /dev/null +++ b/qa/suites/rgw/thrash/thrasher/default.yaml @@ -0,0 +1,8 @@ +tasks: +- thrashosds: + timeout: 1200 + chance_pgnum_grow: 1 + chance_pgpnum_fix: 1 + op_delay: 30 + chance_test_min_size: 0 + ceph_objectstore_tool: false diff --git a/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml b/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml new file mode 100644 index 00000000000..32e6af59f91 --- /dev/null +++ b/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml @@ -0,0 +1,7 @@ +# Amazon/S3.pm (cpan) not available as an rpm +os_type: ubuntu +tasks: +- workunit: + clients: + client.0: + - rgw/s3_bucket_quota.pl diff --git a/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml b/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml new file mode 100644 index 00000000000..b792336d5b5 --- /dev/null +++ b/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml @@ -0,0 +1,7 @@ +# Amazon::S3 is not available on el7 +os_type: ubuntu +tasks: +- workunit: + clients: + client.0: + - rgw/s3_multipart_upload.pl diff --git a/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml b/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml new file mode 100644 index 00000000000..e4e68286848 --- /dev/null +++ b/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml @@ -0,0 +1,13 @@ +tasks: +- s3readwrite: + client.0: + rgw_server: client.0 + readwrite: + bucket: rwtest + readers: 10 + writers: 3 + duration: 300 + files: + num: 10 + size: 2000 + stddev: 500 diff --git a/qa/suites/rgw/thrash/workload/rgw_roundtrip.yaml b/qa/suites/rgw/thrash/workload/rgw_roundtrip.yaml new file mode 100644 index 00000000000..621683aeb1b --- /dev/null +++ b/qa/suites/rgw/thrash/workload/rgw_roundtrip.yaml @@ -0,0 +1,13 @@ +tasks: +- s3roundtrip: + client.0: + rgw_server: client.0 + roundtrip: + bucket: rttest + readers: 10 + writers: 3 + duration: 300 + files: + num: 10 + size: 2000 + stddev: 500 diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml new file mode 100644 index 00000000000..9095e382378 --- /dev/null +++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml @@ -0,0 +1,10 @@ +tasks: +- s3tests: + client.0: + force-branch: ceph-master + rgw_server: client.0 +overrides: + ceph: + conf: + client: + rgw lc debug interval: 10 diff --git a/qa/suites/rgw/thrash/workload/rgw_swift.yaml b/qa/suites/rgw/thrash/workload/rgw_swift.yaml new file mode 100644 index 00000000000..45e2fc9cc30 --- /dev/null +++ b/qa/suites/rgw/thrash/workload/rgw_swift.yaml @@ -0,0 +1,4 @@ +tasks: +- swift: + client.0: + rgw_server: client.0 diff --git a/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml b/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml new file mode 100644 index 00000000000..0a9888276fe --- /dev/null +++ b/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml @@ -0,0 +1,7 @@ +# Amazon/S3.pm (cpan) not available as an rpm +os_type: ubuntu +tasks: +- workunit: + clients: + client.0: + - rgw/s3_user_quota.pl