From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 15 Jun 2016 20:08:10 +0000 (-0700)
Subject: Fixes http://tracker.ceph.com/issues/16334
X-Git-Tag: v11.1.1~58^2^2~172^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3977b8ffdbfbf59a8ff9eedb67edbd13cb3ada42;p=ceph.git

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 3fbc6e86b1d..755c70f2aaa 100644
--- 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 481a22754f7..c6602968a0e 100644
--- 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 55f04c37bd6..940c9810271 100644
--- 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 efb9fa18c50..552ed26c28b 100644
--- 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: