Merge lp:~ltrager/maas/lp1603563_2.0 into lp:maas/2.0

[Lee Trager]

Backport from 2.1.1 - Reset status_expires when a non-monitored status is set.

Reviewed in https://code.launchpad.net/~ltrager/maas/lp1603563/+merge/309305

[Lee Trager (ltrager)]

review: Approve

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-10-12 22:31:30 +0000
+++ src/maasserver/models/node.py	2016-10-27 00:45:33 +0000
@@ -122,6 +122,7 @@
     COMMISSIONING_LIKE_STATUSES,
     get_failed_status,
     is_failed_status,
+    MONITORED_STATUSES,
     NODE_FAILURE_MONITORED_STATUS_TIMEOUTS,
     NODE_TRANSITIONS,
 )
@@ -1329,7 +1330,15 @@
                     self.hostname, error)
 
     def save(self, *args, **kwargs):
+        # Reset the status_expires if not a monitored status. This prevents
+        # a race condition seen in LP1603563 where an old status_expires caused
+        # the node to do in a FAILED_RELEASING state due to an old
+        # status_expire being set.
+        if self.status not in MONITORED_STATUSES:
+            self.status_expires = None
+
         super(Node, self).save(*args, **kwargs)
+
         # We let hostname be blank for the initial save, but fix it before the
         # save completes.  This is because set_random_hostname() operates by
         # trying to re-save the node with a random hostname, and retrying until
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-10-12 22:31:30 +0000
+++ src/maasserver/models/tests/test_node.py	2016-10-27 00:45:33 +0000
@@ -2332,6 +2332,15 @@
             "Invalid transition: Retired -> Allocated.",
             node.save)
 
+    def test_save_resets_status_expires_on_non_monitored_status(self):
+        # Regression test for LP:1603563
+        node = factory.make_Node(status=NODE_STATUS.RELEASING)
+        Node._set_status_expires(node.system_id, 60)
+        node.status = NODE_STATUS.READY
+        node.save()
+        node = reload_object(node)
+        self.assertIsNone(node.status_expires)
+
     def test_full_clean_checks_architecture_for_installable_nodes(self):
         device = factory.make_Device(architecture='')
         # Set type here so we don't cause exception while creating object