From 7bb1ceb3f04703e251f591a1596479a04013d237 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 2 Oct 2015 08:33:46 -0400
Subject: [PATCH] log-whitelist 'reached quota' for librados test.sh

A new test verifies that we are stopped by the pool quota (and get
the right error messages or block).  See ceph.git
32962740ce9211626d310a002b23afeb0d05b500.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 suites/powercycle/osd/tasks/rados_api_tests.yaml              | 4 ++++
 suites/rados/monthrash/workloads/rados_api_tests.yaml         | 4 ++++
 suites/rados/thrash/workloads/rados_api_tests.yaml            | 2 ++
 suites/rados/verify/tasks/rados_api_tests.yaml                | 2 ++
 suites/smoke/basic/tasks/mon_thrash.yaml                      | 2 ++
 suites/smoke/basic/tasks/rados_api_tests.yaml                 | 1 +
 .../firefly-hammer-x/parallel/5-workload/rados_api.yaml       | 4 ++++
 .../hammer-x/parallel/5-final-workload/rados_mon_thrash.yaml  | 4 ++++
 suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml  | 1 +
 suites/upgrade/hammer/point-to-point/point-to-point.yaml      | 1 +
 10 files changed, 25 insertions(+)

diff --git a/suites/powercycle/osd/tasks/rados_api_tests.yaml b/suites/powercycle/osd/tasks/rados_api_tests.yaml
index b4708ebd7c0..e654998c242 100644
--- a/suites/powercycle/osd/tasks/rados_api_tests.yaml
+++ b/suites/powercycle/osd/tasks/rados_api_tests.yaml
@@ -1,3 +1,7 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - reached quota
 tasks:
 - ceph-fuse:
 - workunit:
diff --git a/suites/rados/monthrash/workloads/rados_api_tests.yaml b/suites/rados/monthrash/workloads/rados_api_tests.yaml
index cd11ae6ca0c..876a971fd8d 100644
--- a/suites/rados/monthrash/workloads/rados_api_tests.yaml
+++ b/suites/rados/monthrash/workloads/rados_api_tests.yaml
@@ -1,3 +1,7 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - reached quota
 tasks:
 - workunit:
     clients:
diff --git a/suites/rados/thrash/workloads/rados_api_tests.yaml b/suites/rados/thrash/workloads/rados_api_tests.yaml
index f3c4bab8f13..66f1edab751 100644
--- a/suites/rados/thrash/workloads/rados_api_tests.yaml
+++ b/suites/rados/thrash/workloads/rados_api_tests.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-whitelist:
+      - reached quota
     crush_tunables: hammer
     conf:
       client:
diff --git a/suites/rados/verify/tasks/rados_api_tests.yaml b/suites/rados/verify/tasks/rados_api_tests.yaml
index 0031704784e..11e3858f6a7 100644
--- a/suites/rados/verify/tasks/rados_api_tests.yaml
+++ b/suites/rados/verify/tasks/rados_api_tests.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-whitelist:
+      - reached quota
     conf:
       client:
         debug ms: 1
diff --git a/suites/smoke/basic/tasks/mon_thrash.yaml b/suites/smoke/basic/tasks/mon_thrash.yaml
index 0ce6d61a6ff..1ef7919aae6 100644
--- a/suites/smoke/basic/tasks/mon_thrash.yaml
+++ b/suites/smoke/basic/tasks/mon_thrash.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-whitelist:
+      - reached quota
     conf:
       global:
         ms inject delay max: 1
diff --git a/suites/smoke/basic/tasks/rados_api_tests.yaml b/suites/smoke/basic/tasks/rados_api_tests.yaml
index 7049319ea8b..e84459bf826 100644
--- a/suites/smoke/basic/tasks/rados_api_tests.yaml
+++ b/suites/smoke/basic/tasks/rados_api_tests.yaml
@@ -3,6 +3,7 @@ tasks:
 - ceph:
     fs: ext4
     log-whitelist:
+    - reached quota
     - wrongly marked me down
     - objects unfound and apparently lost
 - thrashosds:
diff --git a/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_api.yaml b/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_api.yaml
index c193f0419b6..70249b9ed86 100644
--- a/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_api.yaml
+++ b/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_api.yaml
@@ -1,3 +1,7 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - reached quota
 workload2:
   sequential:
   - workunit:
diff --git a/suites/upgrade/hammer-x/parallel/5-final-workload/rados_mon_thrash.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/rados_mon_thrash.yaml
index f1e30f2419d..cc71c5cc258 100644
--- a/suites/upgrade/hammer-x/parallel/5-final-workload/rados_mon_thrash.yaml
+++ b/suites/upgrade/hammer-x/parallel/5-final-workload/rados_mon_thrash.yaml
@@ -1,3 +1,7 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - reached quota
 tasks:
   - mon_thrash:
       revive_delay: 20
diff --git a/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml b/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml
index 04a3c53e805..5a5ffba36f0 100644
--- a/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml
+++ b/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml
@@ -1,6 +1,7 @@
 overrides:
   ceph:
     log-whitelist:
+    - reached quota
     - scrub
     - osd_map_max_advance
     fs: xfs
diff --git a/suites/upgrade/hammer/point-to-point/point-to-point.yaml b/suites/upgrade/hammer/point-to-point/point-to-point.yaml
index a1471d1e083..db208d5869b 100644
--- a/suites/upgrade/hammer/point-to-point/point-to-point.yaml
+++ b/suites/upgrade/hammer/point-to-point/point-to-point.yaml
@@ -1,6 +1,7 @@
 overrides:
   ceph:
     log-whitelist:
+    - reached quota
     - scrub
     - osd_map_max_advance
     fs: xfs