-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Database connectivity workaround for Magnum (#1917)
- Loading branch information
Showing
2 changed files
with
44 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
images/magnum/patches/magnum/0000-Revert-Remove-use-of-autocommit.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
From 4f309a12433956d09af30eec5a80129dfd069e36 Mon Sep 17 00:00:00 2001 | ||
From: Mohammed Naser <[email protected]> | ||
Date: Tue, 24 Sep 2024 20:12:33 +0000 | ||
Subject: [PATCH] Revert "Remove use of autocommit" | ||
|
||
This reverts commit d544698fae220549f68afa218dd252366fe90b27. | ||
|
||
Reason for revert: Broken networking. | ||
|
||
Change-Id: I002d4825308afb462e698ff69c69977f6da3d9a8 | ||
--- | ||
|
||
diff --git a/magnum/db/sqlalchemy/api.py b/magnum/db/sqlalchemy/api.py | ||
index 0ec4380..f6f3087 100644 | ||
--- a/magnum/db/sqlalchemy/api.py | ||
+++ b/magnum/db/sqlalchemy/api.py | ||
@@ -47,7 +47,9 @@ | ||
def _create_facade_lazily(): | ||
global _FACADE | ||
if _FACADE is None: | ||
- _FACADE = db_session.EngineFacade.from_config(CONF) | ||
+ # FIXME(karolinku): autocommit=True it's not compatible with | ||
+ # SQLAlchemy 2.0, and will be removed in future | ||
+ _FACADE = db_session.EngineFacade.from_config(CONF, autocommit=True) | ||
if profiler_sqlalchemy: | ||
if CONF.profiler.enabled and CONF.profiler.trace_sqlalchemy: | ||
profiler_sqlalchemy.add_tracing(sa, _FACADE.get_engine(), "db") | ||
diff --git a/magnum/db/sqlalchemy/models.py b/magnum/db/sqlalchemy/models.py | ||
index 92b474d..0b7ae94 100644 | ||
--- a/magnum/db/sqlalchemy/models.py | ||
+++ b/magnum/db/sqlalchemy/models.py | ||
@@ -93,8 +93,7 @@ | ||
if session is None: | ||
session = db_api.get_session() | ||
|
||
- with session.begin(): | ||
- super(MagnumBase, self).save(session) | ||
+ super(MagnumBase, self).save(session) | ||
|
||
|
||
Base = declarative_base(cls=MagnumBase) |