openstack/nova
Code Issues Proposed changes

Merge "Fix info_cache and bw_usage update race"

Browse Source
This commit is contained in:
Jenkins 2013-07-10 05:26:54 +00:00 committed by Gerrit Code Review
commit e0b9392e6f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nova/db/sqlalchemy/api.py
View File

@ -2191,7 +2191,14 @@ def instance_info_cache_update(context, instance_uuid, values):
# cache entry, re-create it.
info_cache = models.InstanceInfoCache()
values['instance_uuid'] = instance_uuid
info_cache.update(values)
try:
info_cache.update(values)
except db_exc.DBDuplicateEntry:
# NOTE(sirp): Possible race if two greenthreads attempt to
# recreate the instance cache entry at the same time. First one
# wins.
pass
return info_cache
@ -4447,7 +4454,12 @@ def bw_usage_update(context, uuid, mac, start_period, bw_in, bw_out,
bwusage.bw_out = bw_out
bwusage.last_ctr_in = last_ctr_in
bwusage.last_ctr_out = last_ctr_out
bwusage.save(session=session)
try:
bwusage.save(session=session)
except db_exc.DBDuplicateEntry:
# NOTE(sirp): Possible race if two greenthreads attempt to create
# the usage entry at the same time. First one wins.
pass
####################