From 45fd6a1dcadf7ea7ac6133d753cedab71400bc74 Mon Sep 17 00:00:00 2001
From: Vasu Kulkarni <vasu@redhat.com>
Date: Wed, 13 Sep 2017 20:41:34 -0700
Subject: [PATCH] Various whitelist fixes

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---
 qa/suites/smoke/basic/tasks/rados_api_tests.yaml | 10 +++++-----
 qa/suites/smoke/basic/tasks/rados_bench.yaml     | 16 ++++++++++------
 .../smoke/basic/tasks/rados_cache_snaps.yaml     | 16 ++++++++++------
 qa/suites/smoke/basic/tasks/rados_cls_all.yaml   |  8 ++++++++
 qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml  | 16 ++++++++++------
 qa/suites/smoke/basic/tasks/rados_python.yaml    | 12 +++++++-----
 .../basic/tasks/rados_workunit_loadgen_mix.yaml  |  6 +++++-
 7 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml b/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
index 35ffc9cc2c5f4..bdf1f3c5afe6b 100644
--- a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
@@ -5,12 +5,12 @@ tasks:
     log-whitelist:
     - reached quota
     - but it is still running
-    - objects unfound and apparently lost
+    - overall HEALTH_
+    - (POOL_FULL)
+    - (SMALLER_PGP_NUM)
+    - (CACHE_POOL_NO_HIT_SET)
+    - (CACHE_POOL_NEAR_FULL)
     - (POOL_APP_NOT_ENABLED)
-    - 'noscrub flag(s) set'
-    - OSDMAP_FLAGS
-    - OSD_OUT_OF_ORDER_FULL
-    - CACHE_POOL_NO_HIT_SET
 - thrashosds:
     chance_pgnum_grow: 2
     chance_pgpnum_fix: 1
diff --git a/qa/suites/smoke/basic/tasks/rados_bench.yaml b/qa/suites/smoke/basic/tasks/rados_bench.yaml
index 7a81472caabe1..562cf51fc36d1 100644
--- a/qa/suites/smoke/basic/tasks/rados_bench.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_bench.yaml
@@ -12,12 +12,16 @@ tasks:
 - ceph:
     fs: xfs
     log-whitelist:
-    - but it is still running
-    - objects unfound and apparently lost
-    - 'full ratio(s) out of order '
-    - OSDMAP_FLAGS
-    - OSD_OUT_OF_ORDER_FULL
-    - CACHE_POOL_NO_HIT_SET
+      - overall HEALTH_
+      - \(OSDMAP_FLAGS\)
+      - \(OSD_
+      - \(PG_
+      - \(POOL_
+      - \(CACHE_POOL_
+      - \(SMALLER_PGP_NUM\)
+      - \(OBJECT_
+      - \(REQUEST_SLOW\)
+      - \(TOO_FEW_PGS\)
 - thrashosds:
     chance_pgnum_grow: 2
     chance_pgpnum_fix: 1
diff --git a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
index 5945656441e88..8b14092d5c6de 100644
--- a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
@@ -2,12 +2,16 @@ tasks:
 - install: null
 - ceph:
     log-whitelist:
-    - but it is still running
-    - objects unfound and apparently lost
-    - 'noscrub flag(s) set'
-    - OSDMAP_FLAGS
-    - OSD_OUT_OF_ORDER_FULL
-    - CACHE_POOL_NO_HIT_SET  
+      - overall HEALTH_
+      - \(OSDMAP_FLAGS\)
+      - \(OSD_
+      - \(PG_
+      - \(POOL_
+      - \(CACHE_POOL_
+      - \(SMALLER_PGP_NUM\)
+      - \(OBJECT_
+      - \(REQUEST_SLOW\)
+      - \(TOO_FEW_PGS\)
 - thrashosds:
     chance_pgnum_grow: 2
     chance_pgpnum_fix: 1
diff --git a/qa/suites/smoke/basic/tasks/rados_cls_all.yaml b/qa/suites/smoke/basic/tasks/rados_cls_all.yaml
index 7f18a7e95bd6d..a3e4980dfd99c 100644
--- a/qa/suites/smoke/basic/tasks/rados_cls_all.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_cls_all.yaml
@@ -1,3 +1,11 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd_class_load_list: "cephfs hello journal lock log numops rbd refcount
+                              replica_log rgw sdk statelog timeindex user version"
+        osd_class_default_list: "cephfs hello journal lock log numops rbd refcount
+                                 replica_log rgw sdk statelog timeindex user version"
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml b/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
index 0d51bc5ba782f..c83d08b4ece8c 100644
--- a/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
@@ -3,12 +3,16 @@ tasks:
 - ceph:
     fs: xfs
     log-whitelist:
-    - but it is still running
-    - objects unfound and apparently lost
-    - 'noscrub flag(s) set'
-    - OSDMAP_FLAGS
-    - OSD_OUT_OF_ORDER_FULL
-    - CACHE_POOL_NO_HIT_SET  
+      - overall HEALTH_
+      - \(OSDMAP_FLAGS\)
+      - \(OSD_
+      - \(PG_
+      - \(POOL_
+      - \(CACHE_POOL_
+      - \(SMALLER_PGP_NUM\)
+      - \(OBJECT_
+      - \(REQUEST_SLOW\)
+      - \(TOO_FEW_PGS\)
 - thrashosds:
     chance_pgnum_grow: 3
     chance_pgpnum_fix: 1
diff --git a/qa/suites/smoke/basic/tasks/rados_python.yaml b/qa/suites/smoke/basic/tasks/rados_python.yaml
index b0400286551c1..2a802cd63e706 100644
--- a/qa/suites/smoke/basic/tasks/rados_python.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_python.yaml
@@ -2,11 +2,13 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-      - but it is still running
-      - 'noup flag(s) set'
-      - OSDMAP_FLAGS
-      - OSD_OUT_OF_ORDER_FULL
-      - CACHE_POOL_NO_HIT_SET
+    - but it is still running
+    - overall HEALTH_
+    - \(OSDMAP_FLAGS\)
+    - \(PG_
+    - \(OSD_
+    - \(OBJECT_
+    - \(POOL_APP_NOT_ENABLED\)
 - ceph-fuse:
 - workunit:
     clients:
diff --git a/qa/suites/smoke/basic/tasks/rados_workunit_loadgen_mix.yaml b/qa/suites/smoke/basic/tasks/rados_workunit_loadgen_mix.yaml
index 0d472a33b79a1..26df926e8fa20 100644
--- a/qa/suites/smoke/basic/tasks/rados_workunit_loadgen_mix.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_workunit_loadgen_mix.yaml
@@ -1,7 +1,11 @@
 tasks:
 - install:
 - ceph:
-    fs: ext4
+    fs: xfs
+    log-whitelist:
+    - but it is still running
+    - overall HEALTH_
+    - \(POOL_APP_NOT_ENABLED\)
 - ceph-fuse:
 - workunit:
     clients:
-- 
2.39.5