From 9ac027e29c482898c1e75946fbe52d16359e23af Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Wed, 5 Jul 2017 19:16:36 +0300 Subject: [PATCH] Remove periodic_tasks method from base manager periodic_tasks method was added with 'Initial fork of Nova' commit and refactored while moving to oslo.service. Now it doesn't do anything except calling method from parent class. Change-Id: I24eee484dbf047dded88297ae173689923b3f374 --- cinder/manager.py | 4 ---- cinder/service.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cinder/manager.py b/cinder/manager.py index f9582979bee..ba38476dfca 100644 --- a/cinder/manager.py +++ b/cinder/manager.py @@ -98,10 +98,6 @@ class Manager(base.Base, PeriodicTasks): def service_topic_queue(self): return self.cluster or self.host - def periodic_tasks(self, context, raise_on_error=False): - """Tasks to be run at a periodic interval.""" - return self.run_periodic_tasks(context, raise_on_error=raise_on_error) - def init_host(self, service_id=None, added_to_cluster=None): """Handle initialization if this is a standalone service. diff --git a/cinder/service.py b/cinder/service.py index b7e3af45185..1bd9b31ad73 100644 --- a/cinder/service.py +++ b/cinder/service.py @@ -471,7 +471,7 @@ class Service(service.Service): def periodic_tasks(self, raise_on_error=False): """Tasks to be run at a periodic interval.""" ctxt = context.get_admin_context() - self.manager.periodic_tasks(ctxt, raise_on_error=raise_on_error) + self.manager.run_periodic_tasks(ctxt, raise_on_error=raise_on_error) def report_state(self): """Update the state of this service in the datastore."""