suites: add crush rules to thrash erasure code

Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>

diff --git a/qa/clusters/fixed-4.yaml b/qa/clusters/fixed-4.yaml
index df767f35710ec53fa001efd2203dc62bcd7ec28f..b73163751ab62d4af341b6a697608c7f8616617f 100644 (file)
--- a/qa/clusters/fixed-4.yaml
+++ b/qa/clusters/fixed-4.yaml
@@ -3,6 +3,10 @@ roles:
 - [mon.b, osd.1, osd.5, osd.9, osd.13] 
 - [mon.c, osd.2, osd.6, osd.10, osd.14] 
 - [mgr.x, osd.3, osd.7, osd.11, osd.15, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB
 overrides:
   ceph:
     conf:

diff --git a/qa/erasure-code/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml b/qa/erasure-code/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml
new file mode 100644 (file)
index 0000000..3cfbcd4
--- /dev/null
+++ b/qa/erasure-code/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml
@@ -0,0 +1,52 @@
+roles: 
+- [mon.a, mgr.y, osd.0]
+- [mon.b, osd.1] 
+- [mon.c, osd.2] 
+- [mgr.x, osd.3, client.0]
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 400000
+    max_seconds: 600
+    max_in_flight: 64
+    objects: 1024
+    size: 16384
+    ec_pool: true
+    write_append_excl: false
+    erasure_code_crush:
+      name: jerasure22crush
+      id: 22
+      type: erasure
+      min_size: 3
+      max_size: 6
+      steps: [
+        'set_chooseleaf_tries 5',
+        'set_choose_tries 100',
+        'take default class hdd',
+        'step chooseleaf indep 4 type host',
+        'choose indep 1 type osd',
+        'emit'
+      ]
+    erasure_code_profile:
+      name: jerasure22profile
+      plugin: jerasure
+      k: 2
+      m: 2
+      technique: reed_sol_van
+      crush-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/qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml b/qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
new file mode 100644 (file)
index 0000000..5003c24
--- /dev/null
+++ b/qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
@@ -0,0 +1,48 @@
+overrides:
+  roles:
+    - [mon.a, mgr.y, osd.0, osd.4, osd.8, osd.12]
+    - [mon.b, osd.1, osd.5, osd.9, osd.13]
+    - [mon.c, osd.2, osd.6, osd.10, osd.14]
+    - [mgr.x, osd.3, osd.7, osd.11, osd.15, client.0]
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 400000
+    max_seconds: 600
+    max_in_flight: 64
+    objects: 1024
+    size: 16384
+    ec_pool: true
+    write_append_excl: false
+    erasure_code_crush:
+      name: jerasure86crush
+      id: 86
+      type: erasure
+      min_size: 3
+      max_size: 6
+      steps: [
+        'set_chooseleaf_tries 5',
+        'set_choose_tries 100',
+        'take default class hdd',
+        'choose indep 4 type host',
+        'choose indep 4 type osd',
+        'emit'
+      ]
+    erasure_code_profile:
+      name: jerasure86profile
+      plugin: jerasure
+      k: 8
+      m: 6
+      technique: reed_sol_van
+      crush-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/qa/suites/rados/thrash-erasure-code-crush-4-nodes/% b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/.qa b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/arch/.qa b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/arch/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/arch/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/arch/x86_64.yaml b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/arch/x86_64.yaml
new file mode 100644 (file)
index 0000000..c2409f5
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/arch/x86_64.yaml
@@ -0,0 +1 @@
+arch: x86_64

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/ceph.yaml b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/ceph.yaml
new file mode 120000 (symlink)
index 0000000..a2fd139
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/ceph.yaml
@@ -0,0 +1 @@
+../thrash/ceph.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/mon_election b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/mon_election
new file mode 120000 (symlink)
index 0000000..3f331e6
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/mon_election
@@ -0,0 +1 @@
+.qa/mon_election
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/msgr-failures b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/msgr-failures
new file mode 120000 (symlink)
index 0000000..03689aa
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/msgr-failures
@@ -0,0 +1 @@
+../thrash/msgr-failures
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/objectstore b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/objectstore
new file mode 120000 (symlink)
index 0000000..848c65f
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/objectstore
@@ -0,0 +1 @@
+.qa/objectstore_debug
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/rados.yaml b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/rados.yaml
new file mode 120000 (symlink)
index 0000000..d256979
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/rados.yaml
@@ -0,0 +1 @@
+.qa/config/rados.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/recovery-overrides b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/recovery-overrides
new file mode 120000 (symlink)
index 0000000..1957f2c
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/recovery-overrides
@@ -0,0 +1 @@
+../thrash/2-recovery-overrides
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/supported-random-distro$ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/supported-random-distro$
new file mode 120000 (symlink)
index 0000000..7cef21e
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/supported-random-distro$
@@ -0,0 +1 @@
+../basic/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/thrashers b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/thrashers
new file mode 120000 (symlink)
index 0000000..f461dad
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/thrashers
@@ -0,0 +1 @@
+../thrash/thrashers
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/thrashosds-health.yaml b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..9124eb1
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/thrashosds-health.yaml
@@ -0,0 +1 @@
+.qa/tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/.qa b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml
new file mode 120000 (symlink)
index 0000000..cb75cd1
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml
@@ -0,0 +1 @@
+.qa/erasure-code/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
new file mode 120000 (symlink)
index 0000000..bab649c
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/workloads/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
@@ -0,0 +1 @@
+.qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code/workloads/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml b/qa/suites/rados/thrash-erasure-code/workloads/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
new file mode 120000 (symlink)
index 0000000..bab649c
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code/workloads/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
@@ -0,0 +1 @@
+.qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash/clusters/fixed-2.yaml b/qa/suites/rados/thrash/clusters/fixed-2.yaml
deleted file mode 120000 (symlink)
index 230ff0f..0000000
--- a/qa/suites/rados/thrash/clusters/fixed-2.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/clusters/fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash/clusters/fixed-4.yaml b/qa/suites/rados/thrash/clusters/fixed-4.yaml
new file mode 120000 (symlink)
index 0000000..aa88300
--- /dev/null
+++ b/qa/suites/rados/thrash/clusters/fixed-4.yaml
@@ -0,0 +1 @@
+.qa/clusters/fixed-4.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash/thrashers/careful.yaml b/qa/suites/rados/thrash/thrashers/careful.yaml
index 8190657f3942ba38a2d87aac83a9ccbaa3080d79..7a866fc009d03de89fe0b779aa970579fd942a91 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/careful.yaml
+++ b/qa/suites/rados/thrash/thrashers/careful.yaml
@@ -20,6 +20,8 @@ overrides:
 tasks:
 - thrashosds:
     timeout: 1200
+    min_in: 2
+    thrash_hosts: true
     chance_pgnum_grow: 1
     chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/thrash/thrashers/default.yaml b/qa/suites/rados/thrash/thrashers/default.yaml
index 5a300a9ff7014b60acd8b00b8b5d8dfd7d73d760..6a0cf59a2afd46168163d1e4751ae3d7e19e6cd1 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/default.yaml
+++ b/qa/suites/rados/thrash/thrashers/default.yaml
@@ -21,6 +21,8 @@ overrides:
 tasks:
 - thrashosds:
     timeout: 1200
+    min_in: 2
+    thrash_hosts: true
     chance_pgnum_grow: 1
     chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/thrash/thrashers/mapgap.yaml b/qa/suites/rados/thrash/thrashers/mapgap.yaml
index ea7a0c911b5ca4c2b012554ca3a0303b75475dd5..bc000db3b9f512d515b436e35cd2af8fa9ef9eb5 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/mapgap.yaml
+++ b/qa/suites/rados/thrash/thrashers/mapgap.yaml
@@ -22,6 +22,7 @@ overrides:
 tasks:
 - thrashosds:
     timeout: 1800
+    min_in: 2
     chance_pgnum_grow: 0.25
     chance_pgnum_shrink: 0.25
     chance_pgpnum_fix: 0.25

diff --git a/qa/suites/rados/thrash/thrashers/morepggrow.yaml b/qa/suites/rados/thrash/thrashers/morepggrow.yaml
index f18a88711a0066c349befd295b50c516ff1308b2..d07f051db4fa54c15d0481b3ed6bea2bbcffd57f 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/morepggrow.yaml
+++ b/qa/suites/rados/thrash/thrashers/morepggrow.yaml
@@ -15,6 +15,7 @@ overrides:
 tasks:
 - thrashosds:
     timeout: 1200
+    min_in: 2
     chance_pgnum_grow: 3
     chance_pgpnum_fix: 1
 openstack:

diff --git a/qa/suites/rados/thrash/thrashers/pggrow.yaml b/qa/suites/rados/thrash/thrashers/pggrow.yaml
index 54498d0cfef9be93f24e8b97c83fafddbcd6761f..d3c5a63d0d2228932304c462b1fa9f05588e2a97 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/pggrow.yaml
+++ b/qa/suites/rados/thrash/thrashers/pggrow.yaml
@@ -20,5 +20,7 @@ overrides:
 tasks:
 - thrashosds:
     timeout: 1200
+    min_in: 2
+    thrash_hosts: true
     chance_pgnum_grow: 2
     chance_pgpnum_fix: 1