]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/telemetry: reset health warning after re-opting-in 47307/head
authorYaarit Hatuka <yaarit@redhat.com>
Wed, 6 Jul 2022 21:59:15 +0000 (21:59 +0000)
committerYaarit Hatuka <yaarit@redhat.com>
Wed, 27 Jul 2022 14:17:24 +0000 (14:17 +0000)
When telemetry requires re-opting-in (whenever new data
is available), 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)

Conflicts:
  src/pybind/mgr/telemetry/module.py
  Conflicts were due to the new opt-in flow which was introduced in
  Quincy.

src/pybind/mgr/telemetry/module.py

index 41b8a4b111c9245a407d0bba8d6aed6f281d2045..953e5c5f79835ae9e6af429ef8640d7fad95fdd7 100644 (file)
@@ -787,6 +787,9 @@ class Module(MgrModule):
         self.set_module_option('enabled', True)
         self.set_module_option('last_opt_revision', REVISION)
 
+        # wake up serve() to reset health warning
+        self.event.set()
+
     def off(self):
         self.set_module_option('enabled', False)
         self.set_module_option('last_opt_revision', 1)