]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/telemetry: reset health warning after re-opting-in 47289/head
authorYaarit Hatuka <yaarit@redhat.com>
Wed, 6 Jul 2022 21:59:15 +0000 (21:59 +0000)
committerYaarit Hatuka <yaarit@redhat.com>
Tue, 26 Jul 2022 22:20:10 +0000 (22:20 +0000)
When telemetry requires re-opting-in (either whenever new collections
which require nagging are available, or on major upgrades) a health
warning is set by the module. This health warning should be reset once
the user re-opts-in (with `ceph telemetry on`), but currently it might
take longer. Fixing it here by waking up serve() immediately after
re-opting-in, which will invoke refreshing health checks.

Fixes: https://tracker.ceph.com/issues/56486
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit b8bbf642c1bc985e5e08639f44adc0e0d7c686da)

src/pybind/mgr/telemetry/module.py

index ea97df47741baaff41541cff47e89848e563a018..bff9b843ee71b81bf8ea1cf88a72e69a63fa0147 100644 (file)
@@ -1579,6 +1579,9 @@ To enable, add '--license {LICENSE}' to the 'ceph telemetry on' command.'''
                 msg = f"{msg}\nSome channels are disabled, please enable with:\n"\
                         f"`ceph telemetry enable channel{disabled_channels}`"
 
+            # wake up serve() to reset health warning
+            self.event.set()
+
             return 0, msg, ''
 
     @CLICommand('telemetry off')