From 14636f614e129fff7cbdad1d3b4ffdd38e263586 Mon Sep 17 00:00:00 2001 From: Yaarit Hatuka Date: Tue, 9 Nov 2021 18:31:11 +0000 Subject: [PATCH] mgr/telemetry: fix waiting for mgr to warm up 1. The implementation of config_notify() in telemetry module sets the flag for event, which is supposed to wake up the 'serve' thread whenever a config option is changed. The problem is that we call config_notify() at the beginning of serve(), before we enter its 'run' loop. This call sets the event which cancels the 10 seconds wait for the mgr to warm up. To fix this, we extract the logic of updating the config options to a separate function (config_update_module_option()), and call it on __init__, instead of calling config_notify() in serve(). 2. We should always wait for the mgr to warm up here (10 seconds). In case of a sporadic event (e.g. a config option change via CLI) the event will be set, and wait will return immediately. We enforce this wait by using time.sleep(10) instead of event.wait(10). Fixes: https://tracker.ceph.com/issues/53204 Signed-off-by: Yaarit Hatuka (cherry picked from commit fa5cc0ca081ca3cce552e0cb21a1e17273cf3482) Conflicts: src/pybind/mgr/telemetry/module.py - Several options under __init__ had to be removed that were not present in Pacific - No type checking in Pacific --- src/pybind/mgr/telemetry/module.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py index f025e94013a81..41b8a4b111c92 100644 --- a/src/pybind/mgr/telemetry/module.py +++ b/src/pybind/mgr/telemetry/module.py @@ -204,13 +204,17 @@ class Module(MgrModule): self.last_report = dict() self.report_id = None self.salt = None + self.config_update_module_option() - def config_notify(self): + def config_update_module_option(self): for opt in self.MODULE_OPTIONS: setattr(self, opt['name'], self.get_module_option(opt['name'])) self.log.debug(' %s = %s', opt['name'], getattr(self, opt['name'])) + + def config_notify(self): + self.config_update_module_option() # wake up serve() thread self.event.set() @@ -823,11 +827,10 @@ class Module(MgrModule): def serve(self): self.load() - self.config_notify() self.run = True self.log.debug('Waiting for mgr to warm up') - self.event.wait(10) + time.sleep(10) while self.run: self.event.clear() -- 2.39.5