Merge lp:~newell-jensen/maas/2.0-fix-1614659 into lp:maas/2.0

[Newell Jensen]

Backport trunk r5447: Revert to previous status when error during 'Releasing'

[Newell Jensen (newell-jensen)]

Self approve backport.

review: Approve

=== modified file 'src/maasserver/api/tests/test_machines.py'
--- src/maasserver/api/tests/test_machines.py	2016-06-09 23:39:53 +0000
+++ src/maasserver/api/tests/test_machines.py	2016-10-05 19:12:06 +0000
@@ -1391,7 +1391,8 @@
 
     def test_POST_release_returns_modified_machines(self):
         owner = self.user
-        self.patch(Machine, "_stop").return_value = None
+        self.patch(Machine, '_stop')
+        self.patch(Machine, '_set_status')
         acceptable_states = [NODE_STATUS.READY] + RELEASABLE_STATUSES
         machines = [
             factory.make_Node_with_Interface_on_Subnet(
 
=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-07-25 23:25:53 +0000
+++ src/maasserver/models/node.py	2016-10-05 19:12:06 +0000
@@ -2187,7 +2187,14 @@
         # the issue this will cause.
         if self.power_state != POWER_STATE.OFF:
             try:
-                self._stop(self.owner)
+                # Node.stop() has synchronous and asynchronous parts, so catch
+                # exceptions arising synchronously, and chain callbacks to the
+                # Deferred it returns for the asynchronous (post-commit) bits.
+                stopping = self._stop(self.owner)
+                # If there's an error, reset the node's status.
+                stopping.addErrback(
+                    callOutToDatabase, Node._set_status, self.system_id,
+                    status=self.status)
             except Exception as ex:
                 maaslog.error(
                     "%s: Unable to shut node down: %s", self.hostname,
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-07-25 23:25:53 +0000
+++ src/maasserver/models/tests/test_node.py	2016-10-05 19:12:06 +0000
@@ -1536,7 +1536,8 @@
         node = factory.make_Node(
             status=NODE_STATUS.ALLOCATED, owner=owner, agent_name=agent_name)
         self.patch(Node, '_set_status_expires')
-        self.patch(node, '_stop').return_value = None
+        self.patch(node, '_stop')
+        self.patch(node, '_set_status')
         node_result = factory.make_NodeResult_for_installation(node=node)
         self.assertEqual(
             [node_result], list(NodeResult.objects.filter(
@@ -1704,7 +1705,8 @@
     def test_release_turns_on_netboot(self):
         node = factory.make_Node(
             status=NODE_STATUS.ALLOCATED, owner=factory.make_User())
-        self.patch(node, '_stop').return_value = None
+        self.patch(node, '_stop')
+        self.patch(node, '_set_status')
         node.set_netboot(on=False)
         with post_commit_hooks:
             node.release()
@@ -1713,7 +1715,8 @@
     def test_release_logs_user_request(self):
         owner = factory.make_User()
         node = factory.make_Node(status=NODE_STATUS.ALLOCATED, owner=owner)
-        self.patch(node, "_stop").return_value = None
+        self.patch(node, '_stop')
+        self.patch(node, '_set_status')
         register_event = self.patch(node, '_register_request_event')
         with post_commit_hooks:
             node.release(owner)
@@ -1726,7 +1729,8 @@
             status=NODE_STATUS.ALLOCATED, owner=factory.make_User())
         node.osystem = factory.make_name('os')
         node.distro_series = factory.make_name('series')
-        self.patch(node, "_stop").return_value = None
+        self.patch(node, '_stop')
+        self.patch(node, '_set_status')
         with post_commit_hooks:
             node.release()
         self.assertEqual("", node.osystem)
@@ -1777,6 +1781,8 @@
         release_auto_ips = self.patch_autospec(
             node, "release_auto_ips")
         self.patch(Node, '_set_status_expires')
+        self.patch(node, '_stop')
+        self.patch(node, '_set_status')
         with post_commit_hooks:
             node.release()
         self.assertThat(release_auto_ips, MockCalledOnceWith())
@@ -1818,7 +1824,7 @@
         node_stop.side_effect = factory.make_exception()
 
         try:
-            with transaction.atomic():
+            with post_commit_hooks:
                 node.release()
         except node_stop.side_effect.__class__:
             # We don't care about the error here, so suppress it. It
@@ -1832,7 +1838,8 @@
         node = factory.make_Node(
             status=NODE_STATUS.ALLOCATED, owner=factory.make_User())
         mock_clear = self.patch(node, "_clear_acquired_filesystems")
-        self.patch(node, "_stop").return_value = None
+        self.patch(node, '_stop')
+        self.patch(node, '_set_status')
         with post_commit_hooks:
             node.release()
         self.assertThat(mock_clear, MockCalledOnceWith())
@@ -3611,7 +3618,8 @@
         self.assertItemsEqual(other_nodes, Node.objects.all())
 
     def test_children_get_deleted_when_parent_is_released(self):
-        self.patch(Node, "_stop").return_value = None
+        self.patch(Node, '_stop')
+        self.patch(Node, '_set_status')
         owner = factory.make_User()
         # Create children.
         parent = factory.make_Node(status=NODE_STATUS.ALLOCATED, owner=owner)
 
=== modified file 'src/maasserver/node_status.py'
--- src/maasserver/node_status.py	2016-07-22 16:11:04 +0000
+++ src/maasserver/node_status.py	2016-10-05 19:12:06 +0000
@@ -80,9 +80,15 @@
         NODE_STATUS.RELEASING,
         ],
     NODE_STATUS.RELEASING: [
+        NODE_STATUS.ALLOCATED,
+        NODE_STATUS.RESERVED,
+        NODE_STATUS.DEPLOYING,
+        NODE_STATUS.DEPLOYED,
         NODE_STATUS.READY,
         NODE_STATUS.BROKEN,
         NODE_STATUS.MISSING,
+        NODE_STATUS.FAILED_DEPLOYMENT,
+        NODE_STATUS.FAILED_DISK_ERASING,
         NODE_STATUS.FAILED_RELEASING,
         ],
     NODE_STATUS.DEPLOYING: [