diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-27 21:27:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-27 21:27:53 +0000 |
| commit | c8243a90c46ec321e596ded8d1b7b122f2b478ad (patch) | |
| tree | af0593dc50057800e3e2270f2508d95b619c0c78 | |
| parent | beec41081ad8b7898bc01402a29ee61e1264c5ab (diff) | |
| parent | 9efa08d4a322e6331b7b48b3a04b1c0636ed68d3 (diff) | |
| download | ceilometer-c8243a90c46ec321e596ded8d1b7b122f2b478ad.tar.gz | |
Merge "Optimize the flow of getting pollster resources"
| -rw-r--r-- | ceilometer/agent/base.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ceilometer/agent/base.py b/ceilometer/agent/base.py index e00d70fd..631c82f1 100644 --- a/ceilometer/agent/base.py +++ b/ceilometer/agent/base.py @@ -130,15 +130,12 @@ class PollingTask(object): LOG.info(_("Polling pollster %(poll)s in the context of " "%(src)s"), dict(poll=pollster.name, src=source_name)) - pollster_resources = [] - if pollster.obj.default_discovery: - pollster_resources = self.manager.discover( - [pollster.obj.default_discovery], discovery_cache) key = Resources.key(source_name, pollster) - source_resources = list( + candidate_res = list( self.resources[key].get(discovery_cache)) - candidate_res = (source_resources or - pollster_resources) + if not candidate_res and pollster.obj.default_discovery: + candidate_res = self.manager.discover( + [pollster.obj.default_discovery], discovery_cache) # Remove duplicated resources and black resources. Using # set() requires well defined __hash__ for each resource. |