Merge lp:~allenap/maas/power-monitor-better-error-message--bug-1580817 into lp:~maas-committers/maas/trunk

[Gavin Panella]

In the power monitor, log a less alarming message when the connection to the region is lost cleanly.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/provisioningserver/pserv_services/node_power_monitor_service.py'
--- src/provisioningserver/pserv_services/node_power_monitor_service.py	2016-03-28 13:54:47 +0000
+++ src/provisioningserver/pserv_services/node_power_monitor_service.py	2016-05-31 17:43:55 +0000
@@ -20,6 +20,7 @@
 from provisioningserver.rpc.region import ListNodePowerParameters
 from twisted.application.internet import TimerService
 from twisted.internet.defer import inlineCallbacks
+from twisted.internet.error import ConnectionDone
 from twisted.python import log
 
 
@@ -74,6 +75,9 @@
         if failure.check(NoSuchCluster):
             maaslog.error(
                 "Rack controller '%s' is not recognised.", localIdent)
+        elif failure.check(ConnectionDone):
+            maaslog.error(
+                "Lost connection to region controller.")
         else:
             # Log the error in full to the Twisted log.
             log.err(failure, "Querying node power states.")

=== modified file 'src/provisioningserver/pserv_services/tests/test_node_power_monitor_service.py'
--- src/provisioningserver/pserv_services/tests/test_node_power_monitor_service.py	2016-05-12 19:07:37 +0000
+++ src/provisioningserver/pserv_services/tests/test_node_power_monitor_service.py	2016-05-31 17:43:55 +0000
@@ -8,6 +8,7 @@
 
 from unittest.mock import (
     ANY,
+    Mock,
     sentinel,
 )
 
@@ -36,6 +37,7 @@
     fail,
     succeed,
 )
+from twisted.internet.error import ConnectionDone
 from twisted.internet.task import Clock
 
 
@@ -123,6 +125,20 @@
         self.assertDocTestMatches(
             "Rack controller '...' is not recognised.", maaslog.output)
 
+    def test_query_nodes_copes_with_losing_connection_to_region(self):
+        service = self.make_monitor_service()
+
+        client = Mock(return_value=fail(
+            ConnectionDone("Connection was closed cleanly.")))
+
+        with FakeLogger("maas") as maaslog:
+            d = service.query_nodes(client)
+            d.addErrback(service.query_nodes_failed, sentinel.ident)
+
+        self.assertEqual(None, extract_result(d))
+        self.assertDocTestMatches(
+            "Lost connection to region controller.", maaslog.output)
+
     def test_try_query_nodes_logs_other_errors(self):
         service = self.make_monitor_service()
         self.patch(npms, "getRegionClient").return_value = sentinel.client