x/group-based-policy
Code Issues Proposed changes

Merge "Fix session handling" into stable/queens

Browse Source
This commit is contained in:
Zuul
2021-01-26 03:40:03 +00:00
committed by Gerrit Code Review
parent f7c1fe2795 fc7cc20056
commit 70e32a08d0
1 changed files with 73 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
gbpservice/neutron/plugins/ml2plus/plugin.py
View File

@@ -165,8 +165,7 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
def _ml2_md_extend_network_dict(result, netdb): def _ml2_md_extend_network_dict(result, netdb):
plugin = directory.get_plugin() plugin = directory.get_plugin()
session = db_api.get_session_from_obj(netdb) session = db_api.get_session_from_obj(netdb)
if not session: if session and session.is_active:
session = db_api.get_writer_session()
# REVISIT: Check if transaction begin is still # REVISIT: Check if transaction begin is still
# required here, and if so, if reader pattern # required here, and if so, if reader pattern
# can be used instead (will require getting the # can be used instead (will require getting the
@@ -176,6 +175,10 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_network_dict( plugin.extension_manager.extend_network_dict(
session, netdb, result) session, netdb, result)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_network_dict(
session, netdb, result)
@staticmethod @staticmethod
@resource_extend.extends([net_def.COLLECTION_NAME + '_BULK']) @resource_extend.extends([net_def.COLLECTION_NAME + '_BULK'])
@@ -183,9 +186,12 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
netdb = results[0][1] if results else None netdb = results[0][1] if results else None
plugin = directory.get_plugin() plugin = directory.get_plugin()
session = db_api.get_session_from_obj(netdb) session = db_api.get_session_from_obj(netdb)
if not session: if session and session.is_active:
session = db_api.get_writer_session()
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_network_dict_bulk(session,
results)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_network_dict_bulk(session, results) plugin.extension_manager.extend_network_dict_bulk(session, results)
@staticmethod @staticmethod
@@ -193,8 +199,7 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
def _ml2_md_extend_port_dict(result, portdb): def _ml2_md_extend_port_dict(result, portdb):
plugin = directory.get_plugin() plugin = directory.get_plugin()
session = db_api.get_session_from_obj(portdb) session = db_api.get_session_from_obj(portdb)
if not session: if session and session.is_active:
session = db_api.get_writer_session()
# REVISIT: Check if transaction begin is still # REVISIT: Check if transaction begin is still
# required here, and if so, if reader pattern # required here, and if so, if reader pattern
# can be used instead (will require getting the # can be used instead (will require getting the
@@ -204,6 +209,10 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_port_dict( plugin.extension_manager.extend_port_dict(
session, portdb, result) session, portdb, result)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_port_dict(
session, portdb, result)
@staticmethod @staticmethod
@resource_extend.extends([port_def.COLLECTION_NAME + '_BULK']) @resource_extend.extends([port_def.COLLECTION_NAME + '_BULK'])
@@ -211,9 +220,12 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
portdb = results[0][1] if results else None portdb = results[0][1] if results else None
plugin = directory.get_plugin() plugin = directory.get_plugin()
session = db_api.get_session_from_obj(portdb) session = db_api.get_session_from_obj(portdb)
if not session: if session and session.is_active:
session = db_api.get_writer_session()
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_port_dict_bulk(session,
results)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_port_dict_bulk(session, results) plugin.extension_manager.extend_port_dict_bulk(session, results)
@staticmethod @staticmethod
@@ -228,6 +240,7 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
# be okay for other resources, as well # be okay for other resources, as well
# as post-queens. # as post-queens.
session = patch_neutron.get_current_session() session = patch_neutron.get_current_session()
if session and session.is_active:
# REVISIT: Check if transaction begin is still # REVISIT: Check if transaction begin is still
# required here, and if so, if reader pattern # required here, and if so, if reader pattern
# can be used instead (will require getting the # can be used instead (will require getting the
@@ -237,6 +250,10 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_subnet_dict( plugin.extension_manager.extend_subnet_dict(
session, subnetdb, result) session, subnetdb, result)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_subnet_dict(
session, subnetdb, result)
@staticmethod @staticmethod
@resource_extend.extends([subnet_def.COLLECTION_NAME + '_BULK']) @resource_extend.extends([subnet_def.COLLECTION_NAME + '_BULK'])
@@ -251,7 +268,12 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
# be okay for other resources, as well # be okay for other resources, as well
# as post-queens. # as post-queens.
session = patch_neutron.get_current_session() session = patch_neutron.get_current_session()
if session and session.is_active:
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_subnet_dict_bulk(session,
results)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_subnet_dict_bulk(session, results) plugin.extension_manager.extend_subnet_dict_bulk(session, results)
@staticmethod @staticmethod
@@ -259,6 +281,8 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
def _ml2_md_extend_subnetpool_dict(result, subnetpooldb): def _ml2_md_extend_subnetpool_dict(result, subnetpooldb):
plugin = directory.get_plugin() plugin = directory.get_plugin()
session = db_api.get_session_from_obj(subnetpooldb) session = db_api.get_session_from_obj(subnetpooldb)
# REVISIT: This is not consistent with other dict
# extend calls, and should be fixed.
if not session: if not session:
session = db_api.get_writer_session() session = db_api.get_writer_session()
# REVISIT: Check if transaction begin is still # REVISIT: Check if transaction begin is still
@@ -277,19 +301,21 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
subnetpooldb = results[0][1] if results else None subnetpooldb = results[0][1] if results else None
plugin = directory.get_plugin() plugin = directory.get_plugin()
session = db_api.get_session_from_obj(subnetpooldb) session = db_api.get_session_from_obj(subnetpooldb)
if not session: if session and session.is_active:
session = db_api.get_writer_session()
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_subnetpool_dict_bulk(session, plugin.extension_manager.extend_subnetpool_dict_bulk(session,
results) results)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_subnetpool_dict_bulk(session,
results)
@staticmethod @staticmethod
@resource_extend.extends([as_def.COLLECTION_NAME]) @resource_extend.extends([as_def.COLLECTION_NAME])
def _ml2_md_extend_address_scope_dict(result, address_scope): def _ml2_md_extend_address_scope_dict(result, address_scope):
plugin = directory.get_plugin() plugin = directory.get_plugin()
session = db_api.get_session_from_obj(address_scope) session = db_api.get_session_from_obj(address_scope)
if not session: if session and session.is_active:
session = db_api.get_writer_session()
# REVISIT: Check if transaction begin is still # REVISIT: Check if transaction begin is still
# required here, and if so, if reader pattern # required here, and if so, if reader pattern
# can be used instead (will require getting the # can be used instead (will require getting the
@@ -299,6 +325,10 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_address_scope_dict( plugin.extension_manager.extend_address_scope_dict(
session, address_scope, result) session, address_scope, result)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_address_scope_dict(
session, address_scope, result)
@staticmethod @staticmethod
@resource_extend.extends([as_def.COLLECTION_NAME + '_BULK']) @resource_extend.extends([as_def.COLLECTION_NAME + '_BULK'])
@@ -306,9 +336,12 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
address_scope = results[0][1] if results else None address_scope = results[0][1] if results else None
plugin = directory.get_plugin() plugin = directory.get_plugin()
session = db_api.get_session_from_obj(address_scope) session = db_api.get_session_from_obj(address_scope)
if not session: if session and session.is_active:
session = db_api.get_writer_session()
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
plugin.extension_manager.extend_address_scope_dict_bulk(
session, results)
else:
session = db_api.get_writer_session()
plugin.extension_manager.extend_address_scope_dict_bulk(session, plugin.extension_manager.extend_address_scope_dict_bulk(session,
results) results)