Merge ~ltrager/maas:lp1789302 into maas:master

[Lee Trager]

LP: #1789302 - Process systemd unit transitioning statuses.

systemctl reports when a unit is transitioning from one state to another. For
MAAS's proposes consider reloading and activating DEAD because the process
isn't available yet and consider deactiving ON because the process is still
available.

63eed23... by Lee Trager on 2018-10-02

Merge branch 'master' into lp1789302

2393000... by Lee Trager on 2018-10-02

Map systemd unit status deactivating to SERVICE_STATE.OFF

f12ab7d... by Lee Trager on 2018-10-02

Fix lint

[Lee Trager (ltrager)]

Updated to map systemd unit status deactiving to SERVICE_STATE.OFF

[Blake Rouse (blake-rouse)]

Looks good, thanks for the change.

review: Approve

diff --git a/src/provisioningserver/utils/service_monitor.py b/src/provisioningserver/utils/service_monitor.py
index 3326f43..ac2b4ed 100644
--- a/src/provisioningserver/utils/service_monitor.py
+++ b/src/provisioningserver/utils/service_monitor.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Services monitor ensures services are in their expected state."""
@@ -234,8 +234,11 @@ class ServiceMonitor:
     # Used to convert the systemd state to the `SERVICE_STATE` enum.
     SYSTEMD_TO_STATE = {
         "active": SERVICE_STATE.ON,
+        "reloading": SERVICE_STATE.DEAD,
         "inactive": SERVICE_STATE.OFF,
         "failed": SERVICE_STATE.DEAD,
+        "activating": SERVICE_STATE.DEAD,
+        "deactivating": SERVICE_STATE.OFF,
     }
 
     # Used to convert the supervisor state to the `SERVICE_STATE` enum.
diff --git a/src/provisioningserver/utils/tests/test_service_monitor.py b/src/provisioningserver/utils/tests/test_service_monitor.py
index 969fb00..2d5728e 100644
--- a/src/provisioningserver/utils/tests/test_service_monitor.py
+++ b/src/provisioningserver/utils/tests/test_service_monitor.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.service_monitor`."""
@@ -681,9 +681,11 @@ class TestServiceMonitor(MAASTestCase):
         systemd_status_output = dedent("""\
             %s.service - LSB: iscsi target daemon
                 Loaded: loaded (/lib/systemd/system/%s.service)
-                Active: inactive (dead)
+                Active: %s (dead)
                 Docs: man:systemd-sysv-generator(8)
-            """) % (service.service_name, service.service_name)
+            """) % (
+            service.service_name, service.service_name,
+            random.choice(['inactive', 'deactivating']))
 
         mock_execSystemDServiceAction = self.patch(
             service_monitor, "_execSystemDServiceAction")
@@ -701,9 +703,11 @@ class TestServiceMonitor(MAASTestCase):
         systemd_status_output = dedent("""\
             %s.service - Fake service
                 Loaded: loaded (/lib/systemd/system/%s.service; ...
-                Active: failed (Result: exit-code) since Wed 2016-01-20...
+                Active: %s (Result: exit-code) since Wed 2016-01-20...
                 Docs: man:dhcpd(8)
-            """) % (service.service_name, service.service_name)
+            """) % (
+            service.service_name, service.service_name,
+            random.choice(['reloading', 'failed', 'activating']))
 
         mock_execSystemDServiceAction = self.patch(
             service_monitor, "_execSystemDServiceAction")