From 33db6bdfdd4e4a30910328b37f1351853586cf2e Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Fri, 27 Apr 2018 12:04:00 -0700 Subject: [PATCH 1/4] qa/suites/rados/perf: override default teuthology settings Signed-off-by: Neha Ojha --- qa/suites/rados/perf/settings/optimized.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qa/suites/rados/perf/settings/optimized.yaml b/qa/suites/rados/perf/settings/optimized.yaml index c2fb9320a11..5ebcb3aeb4a 100644 --- a/qa/suites/rados/perf/settings/optimized.yaml +++ b/qa/suites/rados/perf/settings/optimized.yaml @@ -1,6 +1,15 @@ overrides: ceph: conf: + mon: + debug mon: "0/0" + debug ms: "0/0" + debug paxos: "0/0" + osd: + debug filestore: "0/0" + debug journal: "0/0" + debug ms: "0/0" + debug osd: "0/0" global: auth client required: none auth cluster required: none From f01eb7adc6e6c063044fbb3bf2533a0fd4f4667f Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Fri, 27 Apr 2018 14:49:41 -0700 Subject: [PATCH 2/4] qa/suites/rados/perf: add cosbench workloads Signed-off-by: Neha Ojha --- qa/suites/rados/perf/ceph.yaml | 1 + .../workloads/cosbench_64K_read_write.yaml | 25 +++++++++++++++++++ .../perf/workloads/cosbench_64K_write.yaml | 25 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml create mode 100644 qa/suites/rados/perf/workloads/cosbench_64K_write.yaml diff --git a/qa/suites/rados/perf/ceph.yaml b/qa/suites/rados/perf/ceph.yaml index 4097d8ac20f..912dcbdcac9 100644 --- a/qa/suites/rados/perf/ceph.yaml +++ b/qa/suites/rados/perf/ceph.yaml @@ -10,4 +10,5 @@ tasks: - \(OSD_ - \(OBJECT_ - overall HEALTH +- rgw: [client.0] - ssh_keys: diff --git a/qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml b/qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml new file mode 100644 index 00000000000..ff0662627cf --- /dev/null +++ b/qa/suites/rados/perf/workloads/cosbench_64K_read_write.yaml @@ -0,0 +1,25 @@ +overrides: + rgw: + data_pool_pg_size: 64 + index_pool_pg_size: 64 +tasks: +- cbt: + benchmarks: + cosbench: + obj_size: [64KB] + osd_ra: [4096] + workers: 1 + containers_max: 1000 + objects_max: 100 + mode: [mix] + template: [default] + rampup: 30 + runtime: 300 + rampdown: 30 + containers: ["u(1,100)"] + objects: ["u(1,100)"] + ratio: [60] + cluster: + user: 'ubuntu' + osds_per_node: 1 + iterations: 1 diff --git a/qa/suites/rados/perf/workloads/cosbench_64K_write.yaml b/qa/suites/rados/perf/workloads/cosbench_64K_write.yaml new file mode 100644 index 00000000000..39034a03b9e --- /dev/null +++ b/qa/suites/rados/perf/workloads/cosbench_64K_write.yaml @@ -0,0 +1,25 @@ +overrides: + rgw: + data_pool_pg_size: 64 + index_pool_pg_size: 64 +tasks: +- cbt: + benchmarks: + cosbench: + obj_size: [64KB] + osd_ra: [4096] + workers: 1 + containers_max: 1000 + objects_max: 100 + mode: [write] + template: [default] + rampup: 30 + runtime: 300 + rampdown: 30 + containers: ["u(1,100)"] + objects: ["u(1,100)"] + ratio: [100] + cluster: + user: 'ubuntu' + osds_per_node: 1 + iterations: 1 From f670f2d6d32b09e621e342f4010f402bef3f5d7e Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Fri, 27 Apr 2018 16:07:11 -0700 Subject: [PATCH 3/4] qa/suites/perf-basic: override default teuthology settings Signed-off-by: Neha Ojha --- qa/suites/perf-basic/settings/optimized.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qa/suites/perf-basic/settings/optimized.yaml b/qa/suites/perf-basic/settings/optimized.yaml index 49b6cf0304c..fffb9be5e6c 100644 --- a/qa/suites/perf-basic/settings/optimized.yaml +++ b/qa/suites/perf-basic/settings/optimized.yaml @@ -5,6 +5,15 @@ meta: overrides: ceph: conf: + mon: + debug mon: "0/0" + debug ms: "0/0" + debug paxos: "0/0" + osd: + debug filestore: "0/0" + debug journal: "0/0" + debug ms: "0/0" + debug osd: "0/0" global: auth client required: none auth cluster required: none From 1b6bf0d4236c5bbc2571f7b27454e79ebcf8e8d5 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Fri, 27 Apr 2018 16:10:13 -0700 Subject: [PATCH 4/4] qa/suites/perf-basic: add cosbench write workload Signed-off-by: Neha Ojha --- qa/suites/perf-basic/ceph.yaml | 2 ++ .../workloads/cosbench_64K_write.yaml | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 qa/suites/perf-basic/workloads/cosbench_64K_write.yaml diff --git a/qa/suites/perf-basic/ceph.yaml b/qa/suites/perf-basic/ceph.yaml index 6304487347f..43807c693b8 100644 --- a/qa/suites/perf-basic/ceph.yaml +++ b/qa/suites/perf-basic/ceph.yaml @@ -6,6 +6,7 @@ meta: and can't be compared across runs. Run ceph on a single node. Use xfs beneath the osds. + Setup rgw on client.0 roles: - [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0] @@ -19,4 +20,5 @@ tasks: - \(OSD_ - \(OBJECT_ - overall HEALTH +- rgw: [client.0] - ssh_keys: diff --git a/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml b/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml new file mode 100644 index 00000000000..1dbeef4a891 --- /dev/null +++ b/qa/suites/perf-basic/workloads/cosbench_64K_write.yaml @@ -0,0 +1,30 @@ +meta: +- desc: | + Run cosbench benchmark using cbt. + 64K write workload. + +overrides: + rgw: + data_pool_pg_size: 64 + index_pool_pg_size: 64 +tasks: +- cbt: + benchmarks: + cosbench: + obj_size: [64KB] + osd_ra: [4096] + workers: 1 + containers_max: 1000 + objects_max: 100 + mode: [write] + template: [default] + rampup: 30 + runtime: 300 + rampdown: 30 + containers: ["u(1,100)"] + objects: ["u(1,100)"] + ratio: [100] + cluster: + user: 'ubuntu' + osds_per_node: 1 + iterations: 1