openstack
/
nova
Code Issues Proposed changes

Merge "Use an independent transaction for _trait_sync"

This commit is contained in:
Zuul 2018-04-25 02:17:35 +00:00 committed by Gerrit Code Review
parent 82effe8d37 e2924ba237
commit 0a642e2eee
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/api/openstack/placement/objects/resource_provider.py
View File

@ -78,7 +78,9 @@ def _ensure_rc_cache(ctx):
@oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
@db_api.api_context_manager.writer
# Bug #1760322: If the caller raises an exception, we don't want the trait
# sync rolled back; so use an .independent transaction
@db_api.api_context_manager.writer.independent
def _trait_sync(ctx):
"""Sync the os_traits symbols to the database.

15
nova/tests/functional/api/openstack/placement/db/test_resource_provider.py
View File

@ -2409,19 +2409,16 @@ class ResourceProviderTraitTestCase(ResourceProviderBaseCase):
rp_obj.Trait.get_by_name, self.ctx, 'CUSTOM_TRAIT_A')
def test_bug_1760322(self):
# If the first hit to the traits table results in an exception, the
# sync transaction rolls back and the table stays empty. But
# _TRAITS_SYNCED got set to True, so it doesn't resync next time.
# Under bug # #1760322, if the first hit to the traits table resulted
# in an exception, the sync transaction rolled back and the table
# stayed empty; but _TRAITS_SYNCED got set to True, so it didn't resync
# next time.
try:
rp_obj.Trait.get_by_name(self.ctx, 'CUSTOM_GOLD')
except exception.TraitNotFound:
pass
# FIXME(efried): Bug #1760322: Should still succeed for a "real" trait.
# rp_obj.Trait.get_by_name(self.ctx, os_traits.HW_CPU_X86_AVX2)
# ...but instead raises TraitNotFound.
self.assertRaises(
exception.TraitNotFound,
rp_obj.Trait.get_by_name, self.ctx, os_traits.HW_CPU_X86_AVX2)
# Under bug #1760322, this raised TraitNotFound.
rp_obj.Trait.get_by_name(self.ctx, os_traits.HW_CPU_X86_AVX2)
def test_trait_destroy(self):
t = rp_obj.Trait(self.ctx)