openstack
/
deb-ceilometer
Code Issues Proposed changes

Merge "Set a correct number of threads for polling tasks"

This commit is contained in:
Jenkins 2016-09-15 23:39:58 +00:00 committed by Gerrit Code Review
parent 8263624d40 f3ca7d86d4
commit 91d4a9479d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ceilometer/agent/manager.py
View File

@ -383,11 +383,6 @@ class AgentManager(service_base.PipelineBasedService):
if discovery_group_id else None)
def start_polling_tasks(self):
# NOTE(sileht): 1000 is just the same as previous oslo_service code
self.polling_periodics = periodics.PeriodicWorker.create(
[], executor_factory=lambda:
futures.ThreadPoolExecutor(max_workers=1000))
# allow time for coordination if necessary
delay_start = self.partition_coordinator.is_active()
@ -396,6 +391,12 @@ class AgentManager(service_base.PipelineBasedService):
0, cfg.CONF.shuffle_time_before_polling_task)
data = self.setup_polling_tasks()
# One thread per polling tasks is enough
self.polling_periodics = periodics.PeriodicWorker.create(
[], executor_factory=lambda:
futures.ThreadPoolExecutor(max_workers=len(data)))
for interval, polling_task in data.items():
delay_time = (interval + delay_polling_time if delay_start
else delay_polling_time)