openstack/nova
Code Issues Proposed changes

Merge "Add debug logging when Instance raises OrphanedObjectError" into stable/xena

Browse Source
This commit is contained in:
Zuul 2023-11-16 20:53:08 +00:00 committed by Gerrit Code Review
commit af9964dda1
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/objects/instance.py
View File

@ -1088,6 +1088,11 @@ class Instance(base.NovaPersistentObject, base.NovaObject,
def obj_load_attr(self, attrname):
# NOTE(danms): We can't lazy-load anything without a context and a uuid
if not self._context:
if 'uuid' in self:
LOG.debug(
"Lazy-load of '%s' attempted by orphaned instance",
attrname, instance=self
)
raise exception.OrphanedObjectError(method='obj_load_attr',
objtype=self.obj_name())
if 'uuid' not in self:

15
nova/tests/unit/objects/test_instance.py
View File

@ -1632,6 +1632,21 @@ class TestInstanceObject(test_objects._LocalTest,
self._test_save_objectfield_fk_constraint_fails(
'other_foreign_key', db_exc.DBReferenceError)
@mock.patch('nova.objects.instance.LOG.debug')
def test_obj_load_attr_log(self, mock_log_debug):
# Instance with no UUID should not log.
instance = objects.Instance()
self.assertRaises(
exception.OrphanedObjectError, instance.obj_load_attr, 'foo')
mock_log_debug.assert_not_called()
# Instance with UUID should log.
instance = objects.Instance(
uuid='127a0d59-b88c-422b-b9a1-2dc7cc51fb9a')
self.assertRaises(
exception.OrphanedObjectError, instance.obj_load_attr, 'foo')
msg = "Lazy-load of '%s' attempted by orphaned instance"
mock_log_debug.assert_called_once_with(msg, 'foo', instance=instance)
class TestRemoteInstanceObject(test_objects._RemoteTest,
_TestInstanceObject):