From a42c39a38a92fda735d41bc5f1801a386ffe0bab Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 15 Sep 2023 15:33:27 +0200
Subject: [PATCH] qa/suites/rbd: disable POOL_APP_NOT_ENABLED health check

Commit 990806e635a1 ("mon, qa: issue pool application warning even
if pool is empty") made it impossible to create a pool without raising
a (bogus) health alert.  See [1] for details.

[1] https://lists.ceph.io/hyperkitty/list/dev@ceph.io/thread/ZTDYC5HN677RR26EB4P6PORN6L2IFH4R/

Fixes: https://tracker.ceph.com/issues/62711
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit e64830eb8e94eafa42b0a5f6cacd5359db317a0b)
---
 qa/{suites/rbd/librbd/config/none.yaml => rbd/conf/+}        | 0
 qa/rbd/conf/disable-pool-app.yaml                            | 5 +++++
 qa/suites/rbd/basic/conf                                     | 1 +
 qa/suites/rbd/cli/conf                                       | 1 +
 qa/suites/rbd/cli_v1/conf                                    | 1 +
 qa/suites/rbd/encryption/conf                                | 1 +
 qa/suites/rbd/immutable-object-cache/conf                    | 1 +
 qa/suites/rbd/iscsi/conf                                     | 1 +
 qa/suites/rbd/librbd/conf                                    | 1 +
 qa/suites/rbd/librbd/{config => extra-conf}/.qa              | 0
 .../rbd/librbd/{config => extra-conf}/copy-on-read.yaml      | 0
 qa/suites/rbd/librbd/extra-conf/none.yaml                    | 0
 .../{config => extra-conf}/permit-partial-discard.yaml       | 0
 qa/suites/rbd/maintenance/conf                               | 1 +
 qa/suites/rbd/migration/conf                                 | 1 +
 qa/suites/rbd/mirror-thrash/conf                             | 1 +
 qa/suites/rbd/mirror/conf                                    | 1 +
 qa/suites/rbd/nbd/conf                                       | 1 +
 qa/suites/rbd/pwl-cache/home/conf                            | 1 +
 qa/suites/rbd/pwl-cache/tmpfs/conf                           | 1 +
 qa/suites/rbd/qemu/conf                                      | 1 +
 qa/suites/rbd/singleton-bluestore/conf                       | 1 +
 qa/suites/rbd/singleton/conf                                 | 1 +
 qa/suites/rbd/thrash/conf                                    | 1 +
 qa/suites/rbd/valgrind/conf                                  | 1 +
 25 files changed, 24 insertions(+)
 rename qa/{suites/rbd/librbd/config/none.yaml => rbd/conf/+} (100%)
 create mode 100644 qa/rbd/conf/disable-pool-app.yaml
 create mode 120000 qa/suites/rbd/basic/conf
 create mode 120000 qa/suites/rbd/cli/conf
 create mode 120000 qa/suites/rbd/cli_v1/conf
 create mode 120000 qa/suites/rbd/encryption/conf
 create mode 120000 qa/suites/rbd/immutable-object-cache/conf
 create mode 120000 qa/suites/rbd/iscsi/conf
 create mode 120000 qa/suites/rbd/librbd/conf
 rename qa/suites/rbd/librbd/{config => extra-conf}/.qa (100%)
 rename qa/suites/rbd/librbd/{config => extra-conf}/copy-on-read.yaml (100%)
 create mode 100644 qa/suites/rbd/librbd/extra-conf/none.yaml
 rename qa/suites/rbd/librbd/{config => extra-conf}/permit-partial-discard.yaml (100%)
 create mode 120000 qa/suites/rbd/maintenance/conf
 create mode 120000 qa/suites/rbd/migration/conf
 create mode 120000 qa/suites/rbd/mirror-thrash/conf
 create mode 120000 qa/suites/rbd/mirror/conf
 create mode 120000 qa/suites/rbd/nbd/conf
 create mode 120000 qa/suites/rbd/pwl-cache/home/conf
 create mode 120000 qa/suites/rbd/pwl-cache/tmpfs/conf
 create mode 120000 qa/suites/rbd/qemu/conf
 create mode 120000 qa/suites/rbd/singleton-bluestore/conf
 create mode 120000 qa/suites/rbd/singleton/conf
 create mode 120000 qa/suites/rbd/thrash/conf
 create mode 120000 qa/suites/rbd/valgrind/conf

diff --git a/qa/suites/rbd/librbd/config/none.yaml b/qa/rbd/conf/+
similarity index 100%
rename from qa/suites/rbd/librbd/config/none.yaml
rename to qa/rbd/conf/+
diff --git a/qa/rbd/conf/disable-pool-app.yaml b/qa/rbd/conf/disable-pool-app.yaml
new file mode 100644
index 0000000000000..099532f570975
--- /dev/null
+++ b/qa/rbd/conf/disable-pool-app.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        mon warn on pool no app: false
diff --git a/qa/suites/rbd/basic/conf b/qa/suites/rbd/basic/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/basic/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/cli/conf b/qa/suites/rbd/cli/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/cli/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/cli_v1/conf b/qa/suites/rbd/cli_v1/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/cli_v1/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/encryption/conf b/qa/suites/rbd/encryption/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/encryption/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/immutable-object-cache/conf b/qa/suites/rbd/immutable-object-cache/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/immutable-object-cache/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/iscsi/conf b/qa/suites/rbd/iscsi/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/iscsi/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/librbd/conf b/qa/suites/rbd/librbd/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/librbd/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/librbd/config/.qa b/qa/suites/rbd/librbd/extra-conf/.qa
similarity index 100%
rename from qa/suites/rbd/librbd/config/.qa
rename to qa/suites/rbd/librbd/extra-conf/.qa
diff --git a/qa/suites/rbd/librbd/config/copy-on-read.yaml b/qa/suites/rbd/librbd/extra-conf/copy-on-read.yaml
similarity index 100%
rename from qa/suites/rbd/librbd/config/copy-on-read.yaml
rename to qa/suites/rbd/librbd/extra-conf/copy-on-read.yaml
diff --git a/qa/suites/rbd/librbd/extra-conf/none.yaml b/qa/suites/rbd/librbd/extra-conf/none.yaml
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/qa/suites/rbd/librbd/config/permit-partial-discard.yaml b/qa/suites/rbd/librbd/extra-conf/permit-partial-discard.yaml
similarity index 100%
rename from qa/suites/rbd/librbd/config/permit-partial-discard.yaml
rename to qa/suites/rbd/librbd/extra-conf/permit-partial-discard.yaml
diff --git a/qa/suites/rbd/maintenance/conf b/qa/suites/rbd/maintenance/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/maintenance/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/migration/conf b/qa/suites/rbd/migration/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/migration/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/mirror-thrash/conf b/qa/suites/rbd/mirror-thrash/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/mirror-thrash/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/mirror/conf b/qa/suites/rbd/mirror/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/mirror/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/nbd/conf b/qa/suites/rbd/nbd/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/nbd/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/pwl-cache/home/conf b/qa/suites/rbd/pwl-cache/home/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/pwl-cache/home/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/pwl-cache/tmpfs/conf b/qa/suites/rbd/pwl-cache/tmpfs/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/pwl-cache/tmpfs/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/qemu/conf b/qa/suites/rbd/qemu/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/qemu/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/singleton-bluestore/conf b/qa/suites/rbd/singleton-bluestore/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/singleton-bluestore/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/singleton/conf b/qa/suites/rbd/singleton/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/singleton/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/thrash/conf b/qa/suites/rbd/thrash/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/thrash/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
diff --git a/qa/suites/rbd/valgrind/conf b/qa/suites/rbd/valgrind/conf
new file mode 120000
index 0000000000000..4bc0fe86c630d
--- /dev/null
+++ b/qa/suites/rbd/valgrind/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file
-- 
2.39.5