Fixes http://tracker.ceph.com/issues/16334

Fixes http://tracker.ceph.com/issues/16332
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/suites/rados/singleton-nomsgr/all/11429.yaml b/suites/rados/singleton-nomsgr/all/11429.yaml
index 3fbc6e86b1da239759318acde0805a2405367568..755c70f2aaa96190dc68a29f26b9dda8bec0d36d 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/11429.yaml
+++ b/suites/rados/singleton-nomsgr/all/11429.yaml
@@ -23,6 +23,7 @@ overrides:
     - scrub mismatch
     - ScrubResult
     - failed to encode
+    - wrongly marked me down
 roles:
 - - mon.a
   - osd.0

diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
index 481a22754f741183c389ba29b8e12d8ecb2be931..c6602968a0ebb1c35907f1dce519d1e876350295 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
+++ b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
@@ -21,6 +21,7 @@ overrides:
     - scrub mismatch
     - ScrubResult
     - failed to encode
+    - wrongly marked me down
 roles:
 - - mon.a
   - osd.0

diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
index 55f04c37bd6d0b83b5318ecf0a46a2c84bcc2bcd..940c981027102d89e5bce9ff65ffdcb9a6a78a6d 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
+++ b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
@@ -21,6 +21,7 @@ overrides:
     - scrub mismatch
     - ScrubResult
     - failed to encode
+    - wrongly marked me down
 roles:
 - - mon.a
   - osd.0

diff --git a/suites/rados/singleton/all/pg-removal-interruption.yaml b/suites/rados/singleton/all/pg-removal-interruption.yaml
index efb9fa18c5002ef974172b9f4c75952997613c35..552ed26c28be65f2f43e07e045a2e2034800b18d 100644 (file)
--- a/suites/rados/singleton/all/pg-removal-interruption.yaml
+++ b/suites/rados/singleton/all/pg-removal-interruption.yaml
@@ -25,7 +25,4 @@ tasks:
     client.0:
       - sudo ceph osd down 0
 - ceph.restart: [osd.0]
-- exec:
-    client.0:
-      - sudo ceph tell osd.0 flush_pg_stats
 - ceph.healthy: