From 12f4dffc357f055b397a8bc417ddaf08986ebb6f Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 6 Aug 2015 15:33:58 +0200 Subject: [PATCH] erasure-code: add write_append_excl: false Add write_append_excl: false to all erasure-code workloads and use the same workload in all upgrade tests. write_append_excl: false is not meaningfull for all Ceph versions but when it's not it will just be ignored. Signed-off-by: Loic Dachary --- erasure-code/ec-rados-default.yaml | 1 + erasure-code/ec-rados-parallel.yaml | 1 + erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml | 1 + .../ec-rados-plugin=jerasure-k=2-m=1.yaml | 1 + .../ec-rados-plugin=jerasure-k=3-m=1.yaml | 1 + .../ec-rados-plugin=lrc-k=4-m=2-l=3.yaml | 1 + .../ec-rados-plugin=shec-k=4-m=3-c=2.yaml | 6 +--- erasure-code/ec-rados-sequential.yaml | 1 + .../5-workload/ec-rados-default.yaml | 20 +----------- .../ec-rados-plugin=isa-k=2-m=1.yaml | 27 +--------------- .../5-workload/ec-rados-default.yaml | 20 +----------- .../ec-rados-plugin=jerasure-k=3-m=1.yaml | 32 +------------------ 12 files changed, 12 insertions(+), 100 deletions(-) mode change 100644 => 120000 suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml mode change 100644 => 120000 suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml mode change 100644 => 120000 suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml mode change 100644 => 120000 suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml diff --git a/erasure-code/ec-rados-default.yaml b/erasure-code/ec-rados-default.yaml index e874ac1c8c3bc..cc62371e3242f 100644 --- a/erasure-code/ec-rados-default.yaml +++ b/erasure-code/ec-rados-default.yaml @@ -4,6 +4,7 @@ tasks: ops: 4000 objects: 50 ec_pool: true + write_append_excl: false op_weights: read: 100 write: 0 diff --git a/erasure-code/ec-rados-parallel.yaml b/erasure-code/ec-rados-parallel.yaml index 798e7f713bb20..0f01d8424162d 100644 --- a/erasure-code/ec-rados-parallel.yaml +++ b/erasure-code/ec-rados-parallel.yaml @@ -5,6 +5,7 @@ workload: ops: 4000 objects: 50 ec_pool: true + write_append_excl: false op_weights: read: 100 write: 0 diff --git a/erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml b/erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml index fa8f49035f3ef..8d7c49785faab 100644 --- a/erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml +++ b/erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml @@ -4,6 +4,7 @@ tasks: ops: 4000 objects: 50 ec_pool: true + write_append_excl: false erasure_code_profile: name: isaprofile plugin: isa diff --git a/erasure-code/ec-rados-plugin=jerasure-k=2-m=1.yaml b/erasure-code/ec-rados-plugin=jerasure-k=2-m=1.yaml index d8fcffc495fec..4fa8d9f35b200 100644 --- a/erasure-code/ec-rados-plugin=jerasure-k=2-m=1.yaml +++ b/erasure-code/ec-rados-plugin=jerasure-k=2-m=1.yaml @@ -4,6 +4,7 @@ tasks: ops: 4000 objects: 50 ec_pool: true + write_append_excl: false erasure_code_profile: name: jerasure21profile plugin: jerasure diff --git a/erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml b/erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml index 32d96f589db49..3c31a8b30f45d 100644 --- a/erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml +++ b/erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml @@ -10,6 +10,7 @@ tasks: ops: 4000 objects: 50 ec_pool: true + write_append_excl: false erasure_code_profile: name: jerasure31profile plugin: jerasure diff --git a/erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml b/erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml index 6dfe210e81ec8..96139034a24cf 100644 --- a/erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml +++ b/erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml @@ -4,6 +4,7 @@ tasks: ops: 4000 objects: 50 ec_pool: true + write_append_excl: false erasure_code_profile: name: lrcprofile plugin: lrc diff --git a/erasure-code/ec-rados-plugin=shec-k=4-m=3-c=2.yaml b/erasure-code/ec-rados-plugin=shec-k=4-m=3-c=2.yaml index 8eb7eac1a545f..696baeddadf9a 100644 --- a/erasure-code/ec-rados-plugin=shec-k=4-m=3-c=2.yaml +++ b/erasure-code/ec-rados-plugin=shec-k=4-m=3-c=2.yaml @@ -4,6 +4,7 @@ tasks: ops: 400 objects: 50 ec_pool: true + write_append_excl: false erasure_code_profile: name: shecprofile plugin: shec @@ -22,8 +23,3 @@ tasks: copy_from: 50 setattr: 25 rmattr: 25 -overrides: - ceph: - conf: - global: - enable experimental unrecoverable data corrupting features: shec, ms-type-async diff --git a/erasure-code/ec-rados-sequential.yaml b/erasure-code/ec-rados-sequential.yaml index f2f0452257ef0..90536ee6f974a 100644 --- a/erasure-code/ec-rados-sequential.yaml +++ b/erasure-code/ec-rados-sequential.yaml @@ -5,6 +5,7 @@ workload: ops: 4000 objects: 50 ec_pool: true + write_append_excl: false op_weights: read: 100 write: 0 diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml deleted file mode 100644 index cc62371e3242f..0000000000000 --- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml +++ /dev/null @@ -1,19 +0,0 @@ -tasks: - - rados: - clients: [client.0] - ops: 4000 - objects: 50 - ec_pool: true - write_append_excl: false - op_weights: - read: 100 - write: 0 - append: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - copy_from: 50 - setattr: 25 - rmattr: 25 - - print: "**** done rados ec task" diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml new file mode 120000 index 0000000000000..a8a0ae69405a0 --- /dev/null +++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml @@ -0,0 +1 @@ +../../../../../erasure-code/ec-rados-default.yaml \ No newline at end of file diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml deleted file mode 100644 index 760d76035e21a..0000000000000 --- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml +++ /dev/null @@ -1,26 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 50 - ec_pool: true - erasure_code_profile: - name: isaprofile - plugin: isa - k: 2 - m: 1 - technique: reed_sol_van - ruleset-failure-domain: osd - write_append_excl: false - op_weights: - read: 100 - write: 0 - append: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - copy_from: 50 - setattr: 25 - rmattr: 25 -- print: "**** done ec-rados-plugin=isa-k=2-m=1 9-workload" diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml new file mode 120000 index 0000000000000..79888dd1afb19 --- /dev/null +++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml @@ -0,0 +1 @@ +../../../../../erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml \ No newline at end of file diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml deleted file mode 100644 index cc62371e3242f..0000000000000 --- a/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml +++ /dev/null @@ -1,19 +0,0 @@ -tasks: - - rados: - clients: [client.0] - ops: 4000 - objects: 50 - ec_pool: true - write_append_excl: false - op_weights: - read: 100 - write: 0 - append: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - copy_from: 50 - setattr: 25 - rmattr: 25 - - print: "**** done rados ec task" diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml new file mode 120000 index 0000000000000..a8a0ae69405a0 --- /dev/null +++ b/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml @@ -0,0 +1 @@ +../../../../../erasure-code/ec-rados-default.yaml \ No newline at end of file diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml deleted file mode 100644 index 7714312c339bf..0000000000000 --- a/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# -# k=3 implies a stripe_width of 1376*3 = 4128 which is different from -# the default value of 4096 It is also not a multiple of 1024*1024 and -# creates situations where rounding rules during recovery becomes -# necessary. -# -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 50 - ec_pool: true - write_append_excl: false - erasure_code_profile: - name: jerasure31profile - plugin: jerasure - k: 3 - m: 1 - technique: reed_sol_van - ruleset-failure-domain: osd - op_weights: - read: 100 - write: 0 - append: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - copy_from: 50 - setattr: 25 - rmattr: 25 diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml new file mode 120000 index 0000000000000..4b9d9a44a245d --- /dev/null +++ b/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml @@ -0,0 +1 @@ +../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml \ No newline at end of file -- 2.39.5