openstack/cinder
Code Issues Proposed changes

Merge "Fix reporting old stats"

Browse Source
This commit is contained in:
Zuul 2018-02-25 11:51:05 +00:00 committed by Gerrit Code Review
commit b8b696766e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/manager.py
View File

@ -182,7 +182,6 @@ class SchedulerDependentManager(ThreadPoolManager):
"""Remember these capabilities to send on next periodic update."""
self.last_capabilities = capabilities
@periodic_task.periodic_task
def _publish_service_capabilities(self, context):
"""Pass data back to the scheduler at a periodic interval."""
if self.last_capabilities:

2
cinder/volume/manager.py
View File

@ -2374,7 +2374,6 @@ class VolumeManager(manager.CleanableManager,
LOG.info("Migrate volume completed successfully.",
resource=volume)
@periodic_task.periodic_task
def _report_driver_status(self, context):
# It's possible during live db migration that the self.service_uuid
# value isn't set (we didn't restart services), so we'll go ahead
@ -2507,6 +2506,7 @@ class VolumeManager(manager.CleanableManager,
return volume_stats
@periodic_task.periodic_task
def publish_service_capabilities(self, context):
"""Collect driver status and then publish."""
self._report_driver_status(context)