From: Laura Flores Date: Tue, 11 Jun 2024 20:19:06 +0000 (-0500) Subject: qa/workunits: Opt in to new telemetry collections right away after upgrading X-Git-Tag: v20.0.0~1689^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=769d9ccffbd0edb30d65f3e8e0aeb7f2070145ef;p=ceph.git 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 --- diff --git a/qa/workunits/test_telemetry_quincy_x.sh b/qa/workunits/test_telemetry_quincy_x.sh index bfb050cfa59..1ed5f28d55b 100755 --- 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 8558d35cc42..ced20aea2e4 100755 --- 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