From c03cc26ee04734b610d13c694cc8b12ad554b4aa Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 7 Feb 2019 09:04:25 -0500 Subject: [PATCH] Fix deprecation warning for threadgroup.add_timer This resolves the following deprecation warning: b'/home/zuul/src/git.openstack.org/openstack/nova/.tox/functional-py35/ lib/python3.5/site-packages/oslo_service/threadgroup.py:193: DeprecationWarning: Calling add_timer() with arguments to the callback function is deprecated. Use add_timer_args() instead.' The add_timer_args method was added in 1.34.0: Ib2791342263e2b88c045bcc92adc8160f57a0ed6 So the required version of oslo.service is also updated. Change-Id: Id54226dc926839686906d04ecf8d791c0881f82a Partial-Bug: #1813147 --- lower-constraints.txt | 2 +- nova/servicegroup/drivers/db.py | 5 +++-- nova/servicegroup/drivers/mc.py | 5 +++-- nova/tests/unit/servicegroup/test_db_servicegroup.py | 3 ++- nova/tests/unit/servicegroup/test_mc_servicegroup.py | 3 ++- requirements.txt | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index fcb8f308e9..fa676b3da4 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -88,7 +88,7 @@ oslo.privsep==1.23.0 oslo.reports==1.18.0 oslo.rootwrap==5.8.0 oslo.serialization==2.21.1 -oslo.service==1.33.0 +oslo.service==1.34.0 oslo.upgradecheck==0.1.1 oslo.utils==3.37.0 oslo.versionedobjects==1.33.3 diff --git a/nova/servicegroup/drivers/db.py b/nova/servicegroup/drivers/db.py index 02cc2ee009..98a6c435e1 100644 --- a/nova/servicegroup/drivers/db.py +++ b/nova/servicegroup/drivers/db.py @@ -50,8 +50,9 @@ class DbDriver(base.Driver): ' ServiceGroup driver')) report_interval = service.report_interval if report_interval: - service.tg.add_timer(report_interval, self._report_state, - api.INITIAL_REPORTING_DELAY, service) + service.tg.add_timer_args( + report_interval, self._report_state, args=[service], + initial_delay=api.INITIAL_REPORTING_DELAY) def is_up(self, service_ref): """Moved from nova.utils diff --git a/nova/servicegroup/drivers/mc.py b/nova/servicegroup/drivers/mc.py index 73e02b5c84..82dd23f812 100644 --- a/nova/servicegroup/drivers/mc.py +++ b/nova/servicegroup/drivers/mc.py @@ -54,8 +54,9 @@ class MemcachedDriver(base.Driver): 'Memcached based ServiceGroup driver')) report_interval = service.report_interval if report_interval: - service.tg.add_timer(report_interval, self._report_state, - api.INITIAL_REPORTING_DELAY, service) + service.tg.add_timer_args( + report_interval, self._report_state, args=[service], + initial_delay=api.INITIAL_REPORTING_DELAY) def is_up(self, service_ref): """Moved from nova.utils diff --git a/nova/tests/unit/servicegroup/test_db_servicegroup.py b/nova/tests/unit/servicegroup/test_db_servicegroup.py index b54b2cb4b2..f271f71f42 100644 --- a/nova/tests/unit/servicegroup/test_db_servicegroup.py +++ b/nova/tests/unit/servicegroup/test_db_servicegroup.py @@ -76,7 +76,8 @@ class DBServiceGroupTestCase(test.NoDBTestCase): self.servicegroup_api.join('fake-host', 'fake-topic', service) fn = self.servicegroup_api._driver._report_state - service.tg.add_timer.assert_called_once_with(1, fn, 5, service) + service.tg.add_timer_args.assert_called_once_with( + 1, fn, args=[service], initial_delay=5) @mock.patch.object(objects.Service, 'save') def test_report_state(self, upd_mock): diff --git a/nova/tests/unit/servicegroup/test_mc_servicegroup.py b/nova/tests/unit/servicegroup/test_mc_servicegroup.py index 3207ed3981..3b8399dfe3 100644 --- a/nova/tests/unit/servicegroup/test_mc_servicegroup.py +++ b/nova/tests/unit/servicegroup/test_mc_servicegroup.py @@ -52,7 +52,8 @@ class MemcachedServiceGroupTestCase(test.NoDBTestCase): self.servicegroup_api.join('fake-host', 'fake-topic', service) fn = self.servicegroup_api._driver._report_state - service.tg.add_timer.assert_called_once_with(1, fn, 5, service) + service.tg.add_timer_args.assert_called_once_with( + 1, fn, args=[service], initial_delay=5) def test_report_state(self): service_ref = { diff --git a/requirements.txt b/requirements.txt index ff22d4dfef..687396b194 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,7 +50,7 @@ oslo.messaging>=6.3.0 # Apache-2.0 oslo.policy>=1.35.0 # Apache-2.0 oslo.privsep>=1.23.0 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0 -oslo.service>=1.33.0 # Apache-2.0 +oslo.service>=1.34.0 # Apache-2.0 rfc3986>=1.1.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 psutil>=3.2.2 # BSD