openstack
/
nova
Code Issues Proposed changes

Merge "DRY up SchedulerReportClient init"

This commit is contained in:
Zuul 2018-12-14 01:06:05 +00:00 committed by Gerrit Code Review
parent f25e078f15 4cec0c7650
commit f49bcd7782
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/scheduler/client/report.py
View File

@ -267,15 +267,16 @@ class SchedulerReportClient(object):
self._adapter = adapter
# An object that contains a nova-compute-side cache of resource
# provider and inventory information
self._provider_tree = provider_tree.ProviderTree()
self._provider_tree = None
# Track the last time we updated providers' aggregates and traits
self._association_refresh_time = {}
self._association_refresh_time = None
self._client = self._create_client()
# NOTE(danms): Keep track of how naggy we've been
self._warn_count = 0
def clear_provider_cache(self):
LOG.info("Clearing the report client's provider cache.")
def clear_provider_cache(self, init=False):
if not init:
LOG.info("Clearing the report client's provider cache.")
self._provider_tree = provider_tree.ProviderTree()
self._association_refresh_time = {}
@ -283,8 +284,7 @@ class SchedulerReportClient(object):
def _create_client(self):
"""Create the HTTP session accessing the placement service."""
# Flush provider tree and associations so we start from a clean slate.
self._provider_tree = provider_tree.ProviderTree()
self._association_refresh_time = {}
self.clear_provider_cache(init=True)
client = self._adapter or utils.get_ksa_adapter('placement')
# Set accept header on every request to ensure we notify placement
# service of our response body media type preferences.