From 8aca0e99fff1efc14224e7094b42f0153a750569 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Thu, 19 Oct 2017 17:44:33 -0400 Subject: [PATCH] Use stack_id of None for service timer In order to keep the engine service alive, we add a timer that periodically does nothing. Calls to add_timer() require a stack_id, and currently we pass cfg.CONF.periodic_interval. This is highly misleading, because the value you pass for the stack_id has no effect on the interval. The cause was a copy-paste error in 07884448fed64badcf8922c01c1ea044462584b7, when the code changed from calling ThreadGroup.add_timer() to ThreadGroupManager.add_timer(). Use None as the stack ID instead. Change-Id: Ia24a0d3ae9a0295fc811eb5300656399f426408b --- heat/engine/service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heat/engine/service.py b/heat/engine/service.py index 7b9937c777..365a9e6d26 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -93,8 +93,8 @@ class ThreadGroupManager(object): self.msg_queues = collections.defaultdict(list) # Create dummy service task, because when there is nothing queued - # on self.tg the process exits - self.add_timer(cfg.CONF.periodic_interval, self._service_task) + # on any of the service's ThreadGroups, the process exits. + self.add_timer(None, self._service_task) def _service_task(self): """Dummy task which gets queued on the service.Service threadgroup.