openstack
/
deb-networking-mlnx
Code Issues Proposed changes

Merge "fix race condition in migration when delete job done after create port"

This commit is contained in:
Jenkins 2017-01-22 11:13:04 +00:00 committed by Gerrit Code Review
parent 575957e8bd 11b788dca5
commit 003ba225db
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
networking_mlnx/db/db.py
View File

@ -58,7 +58,6 @@ def check_for_older_ops(session, row):
q = session.query(sdn_journal_db.SdnJournal).filter(
or_(sdn_journal_db.SdnJournal.state == sdn_const.PENDING,
sdn_journal_db.SdnJournal.state == sdn_const.PROCESSING),
sdn_journal_db.SdnJournal.operation == row.operation,
sdn_journal_db.SdnJournal.object_uuid == row.object_uuid,
sdn_journal_db.SdnJournal.created_at < row.created_at,
sdn_journal_db.SdnJournal.id != row.id)

22
networking_mlnx/journal/dependency_validations.py
View File

@ -19,15 +19,10 @@ from networking_mlnx.db import db
from networking_mlnx.plugins.ml2.drivers.sdn import constants as sdn_const
def _is_valid_update_operation(session, row):
def _is_valid_operation(session, row):
# Check if there are older updates in the queue
if db.check_for_older_ops(session, row):
return False
# Check for a pending or processing create operation on this uuid
if db.check_for_pending_or_processing_ops(
session, row.object_uuid, sdn_const.POST):
return False
return True
@ -48,7 +43,7 @@ def validate_network_operation(session, row):
session, sdn_const.PORT, row.object_uuid):
return False
elif (row.operation == sdn_const.PUT and
not _is_valid_update_operation(session, row)):
not _is_valid_operation(session, row)):
return False
return True
@ -67,18 +62,7 @@ def validate_port_operation(session, row):
session, network_id, [sdn_const.POST])
if ops:
return False
if (row.operation == sdn_const.PUT and
not _is_valid_update_operation(session, row)):
return False
elif row.operation == sdn_const.DELETE:
# Check for any pending or processing create or update
# ops on this uuid itself
if db.check_for_pending_or_processing_ops(
session, row.object_uuid, [sdn_const.PUT,
sdn_const.POST]):
return False
return True
return _is_valid_operation(session, row)
_VALIDATION_MAP = {