From: David Zafman <dzafman@redhat.com>
Date: Fri, 15 Feb 2019 10:00:52 +0000 (-0800)
Subject: test: Add "slow request" to whitelist for Luminous
X-Git-Tag: v12.2.12~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ceb94c3f75d3515d37115908a6a42ef78983dc0;p=ceph.git

test: Add "slow request" to whitelist for Luminous
Redo backport 0e987665fe480530a0d1664392604713828bfa5c

Replaces: 77258ed181dbe04e56da249a71edd3220baf954a

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 0e987665fe480530a0d1664392604713828bfa5c)

Conflicts:
	qa/suites/rados/singleton/all/osd-recovery.yaml (Use "slow request" for luminous)
	qa/suites/rados/singleton/all/thrash-eio.yaml (Use "slow request" for luminous, keep OBJECT_MISPLACED)
---

diff --git a/qa/suites/rados/singleton/all/osd-recovery.yaml b/qa/suites/rados/singleton/all/osd-recovery.yaml
index 2ec69ad174a..fa8fa704b27 100644
--- a/qa/suites/rados/singleton/all/osd-recovery.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery.yaml
@@ -21,6 +21,7 @@ tasks:
       - \(PG_
       - \(OBJECT_DEGRADED\)
       - \(REQUEST_SLOW\)
+      - slow request
     conf:
       osd:
         osd min pg log entries: 5
diff --git a/qa/suites/rados/singleton/all/thrash-eio.yaml b/qa/suites/rados/singleton/all/thrash-eio.yaml
index 4932364a727..f4db6ca1810 100644
--- a/qa/suites/rados/singleton/all/thrash-eio.yaml
+++ b/qa/suites/rados/singleton/all/thrash-eio.yaml
@@ -28,7 +28,9 @@ tasks:
     - \(OSDMAP_FLAGS\)
     - \(REQUEST_SLOW\)
     - \(PG_
+    - \(OBJECT_MISPLACED\)
     - \(OSD_
+    - slow request
 - thrashosds:
     op_delay: 30
     clean_interval: 120