openstack/cinder
Code Issues Proposed changes

Merge "Don't retry service update in report_state"

Browse Source
This commit is contained in:
Zuul
2024-09-01 23:06:45 +00:00
committed by Gerrit Code Review
parent 9fbe7f7046 8acb0e5120
commit df8879ec0b
6 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/db/api.py
View File

@@ -294,12 +294,12 @@ def service_create(context, values):
return IMPL.service_create(context, values)
def service_update(context, service_id, values):
def service_update(context, service_id, values, retry=True):
"""Set the given properties on an service and update it.
Raises NotFound if service does not exist.
"""
return IMPL.service_update(context, service_id, values)
return IMPL.service_update(context, service_id, values, retry)
def service_get_by_uuid(context, service_uuid):

33
cinder/db/sqlalchemy/api.py
View File

@@ -936,21 +936,32 @@ def service_create(context, values):
@require_admin_context
@oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
@main_context_manager.writer
def service_update(context, service_id, values):
query = _service_query(context, id=service_id)
def service_update(context, service_id, values, retry=True):
def _service_update(context, service_id, values):
query = _service_query(context, id=service_id)
if 'disabled' in values:
entity = query.column_descriptions[0]['entity']
if 'disabled' in values:
entity = query.column_descriptions[0]['entity']
values = values.copy()
values['modified_at'] = values.get('modified_at', timeutils.utcnow())
values['updated_at'] = values.get('updated_at', entity.updated_at)
values = values.copy()
values['modified_at'] = values.get('modified_at',
timeutils.utcnow())
values['updated_at'] = values.get('updated_at',
entity.updated_at)
result = query.update(values)
if not result:
raise exception.ServiceNotFound(service_id=service_id)
result = query.update(values)
if not result:
raise exception.ServiceNotFound(service_id=service_id)
@oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
def _service_update_retry(context, service_id, values):
_service_update(context, service_id, values)
if retry:
_service_update_retry(context, service_id, values)
else:
_service_update(context, service_id, values)
###################

4
cinder/objects/service.py
View File

@@ -153,13 +153,13 @@ class Service(base.CinderPersistentObject, base.CinderObject,
db_service = db.service_create(self._context, updates)
self._from_db_object(self._context, self, db_service)
def save(self):
def save(self, retry=True):
updates = self.cinder_obj_get_changes()
if 'cluster' in updates:
raise exception.ObjectActionError(
action='save', reason=_('cluster changed'))
if updates:
db.service_update(self._context, self.id, updates)
db.service_update(self._context, self.id, updates, retry)
self.obj_reset_changes()
def destroy(self):

2
cinder/service.py
View File

@@ -486,7 +486,7 @@ class Service(service.Service):
if self.availability_zone != service_ref.availability_zone:
service_ref.availability_zone = self.availability_zone
service_ref.save()
service_ref.save(retry=False)
# TODO(termie): make this pattern be more elegant.
if getattr(self, 'model_disconnected', False):

2
cinder/tests/unit/api/contrib/test_services.py
View File

@@ -172,7 +172,7 @@ def fake_service_get_by_id(value):
return None
def fake_service_update(context, service_id, values):
def fake_service_update(context, service_id, values, retry=True):
service = fake_service_get_by_id(service_id)
if service is None:
raise exception.ServiceNotFound(service_id=service_id)

2
cinder/tests/unit/objects/test_service.py
View File

@@ -77,7 +77,7 @@ class TestService(test_objects.BaseObjectsTestCase):
service.topic = 'foobar'
service.save()
service_update.assert_called_once_with(self.context, service.id,
{'topic': 'foobar'})
{'topic': 'foobar'}, True)
@mock.patch('oslo_utils.timeutils.utcnow', return_value=timeutils.utcnow())
@mock.patch('cinder.db.sqlalchemy.api.service_destroy')