Merge lp:~allenap/maas/purge-commit-within-atomic-block into lp:~maas-committers/maas/trunk

[Gavin Panella]

Purge the last remnants of commit_within_atomic_block().

[Blake Rouse (blake-rouse)]

review: Approve

=== modified file 'src/maasserver/utils/orm.py'
--- src/maasserver/utils/orm.py	2015-09-24 16:22:12 +0000
+++ src/maasserver/utils/orm.py	2015-10-06 23:57:19 +0000
@@ -13,7 +13,6 @@
 
 __metaclass__ = type
 __all__ = [
-    'commit_within_atomic_block',
     'disable_all_database_connections',
     'enable_all_database_connections',
     'ExclusivelyConnected',
@@ -59,7 +58,6 @@
 from django.db.transaction import TransactionManagementError
 from django.db.utils import OperationalError
 from maasserver.utils.async import DeferredHooks
-from provisioningserver.utils import warn_deprecated
 from provisioningserver.utils.backoff import (
     exponential_growth,
     full_jitter,
@@ -514,45 +512,6 @@
             "Savepoints cannot be created outside of a transaction.")
 
 
-def commit_within_atomic_block(using="default"):
-    """Exits an atomic block then immediately re-enters a new one.
-
-    This relies on the fact that an atomic block commits when exiting the
-    outer-most context.
-
-    :deprecated: Absolutely don't use this.
-    """
-    warn_deprecated("use post-commit hooks instead")
-    with outside_atomic_block(using):
-        pass  # We just want to exit and enter.
-
-
-@contextmanager
-def outside_atomic_block(using="default"):
-    """A context manager that guarantees to not contain an atomic block.
-
-    On entry into this context, this will exit all nested and unnested atomic
-    blocks until it reaches clear air.
-
-    On exit from this context, the same level of nesting will be
-    reestablished.
-    """
-    connection = transaction.get_connection(using)
-    atomic_context = transaction.atomic(using)
-    assert connection.in_atomic_block
-
-    depth = 0
-    while connection.in_atomic_block:
-        atomic_context.__exit__(None, None, None)
-        depth = depth + 1
-    try:
-        yield
-    finally:
-        while depth > 0:
-            atomic_context.__enter__()
-            depth = depth - 1
-
-
 def in_transaction(connection=connection):
     """Is `connection` in the midst of a transaction?
 
 
=== modified file 'src/maasserver/utils/tests/test_orm.py'
--- src/maasserver/utils/tests/test_orm.py	2015-09-24 16:22:12 +0000
+++ src/maasserver/utils/tests/test_orm.py	2015-10-06 23:57:19 +0000
@@ -31,13 +31,9 @@
 from django.db.transaction import TransactionManagementError
 from django.db.utils import OperationalError
 from maasserver.fields import MAC
-from maasserver.testing.testcase import (
-    MAASTransactionServerTestCase,
-    SerializationFailureTestCase,
-)
+from maasserver.testing.testcase import SerializationFailureTestCase
 from maasserver.utils import orm
 from maasserver.utils.orm import (
-    commit_within_atomic_block,
     disable_all_database_connections,
     DisabledDatabaseConnection,
     enable_all_database_connections,
@@ -52,7 +48,6 @@
     macs_contain,
     macs_do_not_contain,
     make_serialization_failure,
-    outside_atomic_block,
     post_commit,
     post_commit_do,
     post_commit_hooks,
@@ -781,60 +776,6 @@
             self.expectThat(connection.savepoint_ids, HasLength(0))
 
 
-class TestOutsideAtomicBlock(MAASTransactionServerTestCase):
-    """Tests for `outside_atomic_block`."""
-
-    def test__leaves_and_restores_atomic_block(self):
-        self.assertFalse(connection.in_atomic_block)
-        with transaction.atomic():
-            self.assertTrue(connection.in_atomic_block)
-            with outside_atomic_block():
-                self.assertFalse(connection.in_atomic_block)
-            self.assertTrue(connection.in_atomic_block)
-        self.assertFalse(connection.in_atomic_block)
-
-    def test__leaves_and_restores_multiple_levels_of_atomic_blocks(self):
-        self.assertFalse(connection.in_atomic_block)
-        with transaction.atomic():
-            with transaction.atomic():
-                with transaction.atomic():
-                    with transaction.atomic():
-                        with outside_atomic_block():
-                            # It leaves the multiple levels of atomic blocks,
-                            # but puts the same number of levels back in place
-                            # on exit.
-                            self.assertFalse(connection.in_atomic_block)
-                        self.assertTrue(connection.in_atomic_block)
-                    self.assertTrue(connection.in_atomic_block)
-                self.assertTrue(connection.in_atomic_block)
-            self.assertTrue(connection.in_atomic_block)
-        self.assertFalse(connection.in_atomic_block)
-
-    def test__restores_atomic_block_even_on_error(self):
-        with transaction.atomic():
-            exception_type = factory.make_exception_type()
-            try:
-                with outside_atomic_block():
-                    raise exception_type()
-            except exception_type:
-                self.assertTrue(connection.in_atomic_block)
-
-
-class TestCommitWithinAtomicBlock(MAASTransactionServerTestCase):
-    """Tests for `commit_within_atomic_block`."""
-
-    def test__relies_on_outside_atomic_block(self):
-        outside_atomic_block = self.patch(orm, "outside_atomic_block")
-        with transaction.atomic():
-            commit_within_atomic_block()
-        self.expectThat(outside_atomic_block, MockCalledOnceWith("default"))
-        context_manager = outside_atomic_block.return_value
-        self.expectThat(
-            context_manager.__enter__, MockCalledOnceWith())
-        self.expectThat(
-            context_manager.__exit__, MockCalledOnceWith(None, None, None))
-
-
 class TestInTransaction(DjangoTransactionTestCase):
     """Tests for `in_transaction`."""
 
 
=== modified file 'src/maasserver/websockets/handlers/device.py'
--- src/maasserver/websockets/handlers/device.py	2015-09-24 16:22:12 +0000
+++ src/maasserver/websockets/handlers/device.py	2015-10-06 23:57:19 +0000
@@ -31,7 +31,6 @@
 from maasserver.models.staticipaddress import StaticIPAddress
 from maasserver.models.subnet import Subnet
 from maasserver.node_action import compile_node_actions
-from maasserver.utils.orm import commit_within_atomic_block
 from maasserver.websockets.base import (
     HandlerDoesNotExistError,
     HandlerError,
@@ -77,21 +76,6 @@
     return None
 
 
-def delete_device_and_static_ip_addresses(
-        device, external_static_ips, assigned_sticky_ips):
-    """Delete the created external and sticky ips and the created device.
-
-    This function calls `commit_within_atomic_block` to force the transaction
-    to be saved.
-    """
-    for static_ip, _ in external_static_ips:
-        static_ip.deallocate()
-    for static_ip, _ in assigned_sticky_ips:
-        static_ip.deallocate()
-    device.delete()
-    commit_within_atomic_block()
-
-
 def log_static_allocations(device, external_static_ips, assigned_sticky_ips):
     """Log the allocation of the static ip address."""
     all_ips = [