qa/workunits: Opt in to new telemetry collections right away after upgrading

If this does not happen, the test may fail due to the "TELEMETRY_CHANGED" warning
appearing for too long in the cluster log.

Fixes: https://tracker.ceph.com/issues/64458
Signed-off-by: Laura Flores <lflores@ibm.com>

diff --git a/qa/workunits/test_telemetry_quincy_x.sh b/qa/workunits/test_telemetry_quincy_x.sh
index bfb050cfa59bc3b9875ccc6b6abdc73a2d3e72f2..1ed5f28d55becf79a13cfdd59d3396909af4aee5 100755 (executable)
--- a/qa/workunits/test_telemetry_quincy_x.sh
+++ b/qa/workunits/test_telemetry_quincy_x.sh
@@ -1,5 +1,9 @@
 #!/bin/bash -ex
 
+# Opt in to new collections right away to avoid "TELEMETRY_CHANGED"
+# health warning (see https://tracker.ceph.com/issues/64458).
+# Currently, no new collections between latest quincy and reef (dev)
+
 # For quincy, the last_opt_revision remains at 1 since last_opt_revision
 # was phased out for fresh installs of quincy.
 LAST_OPT_REVISION=$(ceph config get mgr mgr/telemetry/last_opt_revision)
@@ -27,9 +31,6 @@ ceph telemetry preview
 ceph telemetry preview-device
 ceph telemetry preview-all
 
-# Opt in to new collections
-# Currently, no new collections between latest quincy and reef (dev)
-
 # Run show commands
 ceph telemetry show
 ceph telemetry show-device

diff --git a/qa/workunits/test_telemetry_reef_x.sh b/qa/workunits/test_telemetry_reef_x.sh
index 8558d35cc4237982234571fc773fd9581553024a..ced20aea2e499f2f881eb668363912207724883c 100755 (executable)
--- a/qa/workunits/test_telemetry_reef_x.sh
+++ b/qa/workunits/test_telemetry_reef_x.sh
@@ -1,5 +1,9 @@
 #!/bin/bash -ex
 
+# Opt in to new collections right away to avoid "TELEMETRY_CHANGED"
+# warning (see https://tracker.ceph.com/issues/64458)
+ceph telemetry on --license sharing-1-0
+
 # For quincy, the last_opt_revision remains at 1 since last_opt_revision
 # was phased out for fresh installs of quincy.
 LAST_OPT_REVISION=$(ceph config get mgr mgr/telemetry/last_opt_revision)
@@ -26,9 +30,6 @@ ceph telemetry preview
 ceph telemetry preview-device
 ceph telemetry preview-all
 
-# Opt in to new collections (basic_pool_flags)
-ceph telemetry on --license sharing-1-0
-
 # Run show commands
 ceph telemetry show
 ceph telemetry show-device