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 <ldachary@redhat.com>

diff --git a/erasure-code/ec-rados-default.yaml b/erasure-code/ec-rados-default.yaml
index e874ac1c8c3bc7148701b2e1380d43d80e14ea43..cc62371e3242f64e67c987f4856b5e0e977b95e3 100644 (file)
--- 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 798e7f713bb20a8941315396316fea5694f3b362..0f01d8424162d4aa969ff22c819a50d3e39f8149 100644 (file)
--- 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 fa8f49035f3efad8f669cde1e3181c9fea048703..8d7c49785faabf39bd965a9d43c83951547f890d 100644 (file)
--- 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 d8fcffc495fec3e37428d86e9439d5793b44d3b1..4fa8d9f35b20021010d1a13d2979302db66a30d3 100644 (file)
--- 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 32d96f589db49fa700897a918ce7a5bfc017388c..3c31a8b30f45d90167d72d96ea5e670f04febd95 100644 (file)
--- 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 6dfe210e81ec820834243b21dab7f14fb714c26e..96139034a24cf0f2df9a67dfaed8ee215041faee 100644 (file)
--- 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 8eb7eac1a545f3c35eccde8e961bc84d7d93feda..696baeddadf9ad71bd852249bd0c35ae485af34e 100644 (file)
--- 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 f2f0452257ef075483197eaa6d5cbaacc7a6da0b..90536ee6f974a88206d2280501063ab8b5c59581 100644 (file)
--- 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 (file)
index cc62371e3242f64e67c987f4856b5e0e977b95e3..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..a8a0ae69405a04e3497c8dfb40e8b61fe0d00e63
--- /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 (file)
index 760d76035e21a7913c3a3bf74070160502cc84b3..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..79888dd1afb1965134d60de02f9ab5c7845bb68f
--- /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 (file)
index cc62371e3242f64e67c987f4856b5e0e977b95e3..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..a8a0ae69405a04e3497c8dfb40e8b61fe0d00e63
--- /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 (file)
index 7714312c339bf511591cd12a543781d812fe6792..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..4b9d9a44a245d600568ba60908e42d2fe3bcbca0
--- /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