rados/thrash*: vary osd_max_backfills, always >1

This can lead to a copy-from vs backfill deadlock; see
http://tracker.ceph.com/issues/18085

This effectively reverts 5e880228fd7f59063d22a51eb5488b369b0c8360
which aimed to catch bugs in recovery reservations.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/suites/rados/thrash-erasure-code-big/thrashers/default.yaml b/suites/rados/thrash-erasure-code-big/thrashers/default.yaml
index e5728c969fe6d968a10b0e10620be4e4f35355f5..5acfcc3ddd969985675c8b5df848b0e913e329ca 100644 (file)
--- a/suites/rados/thrash-erasure-code-big/thrashers/default.yaml
+++ b/suites/rados/thrash-erasure-code-big/thrashers/default.yaml
@@ -8,9 +8,9 @@ tasks:
     conf:
       osd:
         osd debug reject backfill probability: .3
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 6
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml b/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml
index 1a6e900a6f14b52a3fbc91dc1ec8dcb241fcd7dc..5ded6ba7148d8de5704a222d55c140373e841560 100644 (file)
--- a/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml
+++ b/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml
@@ -9,9 +9,9 @@ tasks:
         mon osd pool ec fast read: 1
       osd:
         osd debug reject backfill probability: .3
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 2
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml b/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml
index 99906ba2024cfa6490451f2fa9407bee08938795..f09ec08cfa9c8e14a6f047fc7e71fc60aa0fdbbd 100644 (file)
--- a/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml
+++ b/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml
@@ -3,9 +3,9 @@ tasks:
 - ceph:
     conf:
       osd:
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 9
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml b/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml
index e5728c969fe6d968a10b0e10620be4e4f35355f5..2bece1f939be483ee27cab7229a33b72b920a542 100644 (file)
--- a/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml
+++ b/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml
@@ -8,9 +8,9 @@ tasks:
     conf:
       osd:
         osd debug reject backfill probability: .3
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 3
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/suites/rados/thrash-erasure-code/thrashers/default.yaml b/suites/rados/thrash-erasure-code/thrashers/default.yaml
index fade054b1b7cf7cc5223b6f1beec723a6d5e73a5..211d99a64fb42046784a5765720186deba4010d6 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/default.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/default.yaml
@@ -7,9 +7,9 @@ tasks:
     conf:
       osd:
         osd debug reject backfill probability: .3
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 2
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/suites/rados/thrash-erasure-code/thrashers/fastread.yaml b/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
index 1a6e900a6f14b52a3fbc91dc1ec8dcb241fcd7dc..8f7c455c693c40dd6c58804ee1b9884fdc9bbabc 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
@@ -9,9 +9,9 @@ tasks:
         mon osd pool ec fast read: 1
       osd:
         osd debug reject backfill probability: .3
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 3
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml b/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
index c37147fda2291d9c80dbda1b086a7c82b4aad506..bd448e27285a83c8f7db6fdead4e941c39f917dc 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
@@ -7,6 +7,7 @@ overrides:
         osd map cache size: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 5
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml b/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
index 9ba1b9e5867a5c65c389b1d8d5dfebe621ec74c1..3fe730673b6a6e2c6b173f535aa80f71d993a582 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
@@ -3,9 +3,9 @@ tasks:
 - ceph:
     conf:
       osd:
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 9
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml b/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
index 744761d8cce7e8cd3130592226d188da9e22d612..ecb239a061e461a0fbc29b0db792ad45f523d4ca 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
@@ -8,6 +8,7 @@ tasks:
       osd:
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 4
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 2

diff --git a/suites/rados/thrash/thrashers/default.yaml b/suites/rados/thrash/thrashers/default.yaml
index fabfc4f8c402d8fc4c7b635e90b4b600feaafdb8..f5e432d3fca050413d63a5bc67df887cf964a068 100644 (file)
--- a/suites/rados/thrash/thrashers/default.yaml
+++ b/suites/rados/thrash/thrashers/default.yaml
@@ -7,9 +7,9 @@ tasks:
     conf:
       osd:
         osd debug reject backfill probability: .3
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
+        osd max backfills: 3
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/suites/rados/thrash/thrashers/mapgap.yaml b/suites/rados/thrash/thrashers/mapgap.yaml
index 7854f8356d0b317f9251bf15acc050ca611394c0..5c59340c7ebe10150e7309c278adc634e575fec5 100644 (file)
--- a/suites/rados/thrash/thrashers/mapgap.yaml
+++ b/suites/rados/thrash/thrashers/mapgap.yaml
@@ -8,6 +8,7 @@ overrides:
         osd scrub min interval: 60
         osd scrub max interval: 120
         osd scrub during recovery: false
+        osd max backfills: 6
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/thrash/thrashers/morepggrow.yaml b/suites/rados/thrash/thrashers/morepggrow.yaml
index 20c84b1f1bbce88b474d63395338b9d0e91c1f67..a22f80c584558d5cdf50cf0ea5c45b94677eb04e 100644 (file)
--- a/suites/rados/thrash/thrashers/morepggrow.yaml
+++ b/suites/rados/thrash/thrashers/morepggrow.yaml
@@ -3,13 +3,13 @@ tasks:
 - ceph:
     conf:
       osd:
-        osd max backfills: 1
         osd scrub min interval: 60
         osd scrub max interval: 120
         journal throttle high multiple: 2
         journal throttle max multiple: 10
         filestore queue throttle high multiple: 2
         filestore queue throttle max multiple: 10
+        osd max backfills: 9
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/suites/rados/thrash/thrashers/pggrow.yaml b/suites/rados/thrash/thrashers/pggrow.yaml
index 8b1cf46af505cb603bd0c15f82a496f063317f4d..d381026af3b6f74b53d4d5987f09c6f4218bb398 100644 (file)
--- a/suites/rados/thrash/thrashers/pggrow.yaml
+++ b/suites/rados/thrash/thrashers/pggrow.yaml
@@ -9,6 +9,7 @@ tasks:
         osd scrub min interval: 60
         osd scrub max interval: 120
         filestore odsync write: true
+        osd max backfills: 2
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 2