openstack
/
neutron
Code Issues Proposed changes

Merge "[OVN] During the DB migration, allow the DB context to finish"

This commit is contained in:
Zuul 2022-05-26 16:09:59 +00:00 committed by Gerrit Code Review
parent bedd0504ec 3c637a2d12
commit 7a92c3f060
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
neutron/plugins/ml2/drivers/ovn/db_migration.py
View File

@ -70,29 +70,29 @@ def migrate_neutron_database_to_ovn():
break
for port_id, host in diff:
with db_api.CONTEXT_WRITER.using(ctx):
pb = port_obj.PortBinding.get_object(ctx, port_id=port_id,
host=host)
if not pb or not pb.vif_details:
continue
try:
with db_api.CONTEXT_WRITER.using(ctx):
pb = port_obj.PortBinding.get_object(ctx, port_id=port_id,
host=host)
if not pb or not pb.vif_details:
continue
vif_details = pb.vif_details.copy()
for detail in VIF_DETAILS_TO_REMOVE:
try:
del vif_details[detail]
except KeyError:
pass
if vif_details == pb.vif_details:
continue
vif_details = pb.vif_details.copy()
for detail in VIF_DETAILS_TO_REMOVE:
try:
del vif_details[detail]
except KeyError:
pass
if vif_details == pb.vif_details:
continue
pb.vif_details = vif_details
try:
pb.vif_details = vif_details
pb.update()
except (exceptions.ObjectNotFound,
sqla_exc.StaleDataError,
db_exc.DBDeadlock):
# The PortBinding register has been already modified.
pb_missed.add(port_id)
except (exceptions.ObjectNotFound,
sqla_exc.StaleDataError,
db_exc.DBDeadlock):
# The PortBinding register has been already modified.
pb_missed.add(port_id)
pb_updated.update(diff)