Fixed #23074 -- Avoided leaking savepoints in atomic.

Thanks Chow Loong Jin for the report and the initial patch.

1 files changed, 6 insertions, 0 deletions

diff --git a/django/db/transaction.py b/django/db/transaction.py
index 786bc53581..4fb58d6dd8 100644
--- a/django/db/transaction.py
+++ b/django/db/transaction.py
@@ -219,6 +219,9 @@ class Atomic(object):
                         except DatabaseError:
                             try:
                                 connection.savepoint_rollback(sid)
+                                # The savepoint won't be reused. Release it to
+                                # minimize overhead for the database server.
+                                connection.savepoint_commit(sid)
                             except Error:
                                 # If rolling back to a savepoint fails, mark for
                                 # rollback at a higher level and avoid shadowing
@@ -249,6 +252,9 @@ class Atomic(object):
                     else:
                         try:
                             connection.savepoint_rollback(sid)
+                            # The savepoint won't be reused. Release it to
+                            # minimize overhead for the database server.
+                            connection.savepoint_commit(sid)
                         except Error:
                             # If rolling back to a savepoint fails, mark for
                             # rollback at a higher level and avoid shadowing