Merge ~blake-rouse/maas:fix-dhcpd-restart-timeout into maas:master

[Blake Rouse]

Fixes LP: #1792031 - Force dhcpd to restart in 8 seconds allow service monitor 10 seconds for a command to fail.

[Mike Pontillo (mpontillo)]

+1!

review: Approve

[Mike Pontillo (mpontillo)]

I saw this in testing:

https://paste.ubuntu.com/p/vK84kgK43W/

We might consider making a similar change to the maas-http service.

diff --git a/debian/maas-dhcp.maas-dhcpd.service b/debian/maas-dhcp.maas-dhcpd.service
index b2d47ad..2001c66 100644
--- a/debian/maas-dhcp.maas-dhcpd.service
+++ b/debian/maas-dhcp.maas-dhcpd.service
@@ -23,6 +23,9 @@ ExecStart=/bin/sh -ec '\
     chmod 775 /var/lib/maas/dhcp ; chmod 664 $LEASES_FILE; \
     exec dhcpd -user dhcpd -group dhcpd -f -q -4 -pf /run/maas/dhcp/dhcpd.pid \
         -cf /var/lib/maas/dhcpd.conf -lf $LEASES_FILE $INTERFACES'
+# Require dhcpd stop in 8 seconds, if not kill it with 'mixed' mode.
+TimeoutStopSec=8
+KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/maas-dhcp.maas-dhcpd6.service b/debian/maas-dhcp.maas-dhcpd6.service
index 27e6873..8885bc4 100644
--- a/debian/maas-dhcp.maas-dhcpd6.service
+++ b/debian/maas-dhcp.maas-dhcpd6.service
@@ -23,6 +23,9 @@ ExecStart=/bin/sh -ec '\
     chmod 775 /var/lib/maas/dhcp ; chmod 664 $LEASES_FILE; \
     exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid \
         -cf /var/lib/maas/dhcpd6.conf -lf $LEASES_FILE $INTERFACES'
+# Require dhcpd stop in 8 seconds, if not kill it with 'mixed' mode.
+TimeoutStopSec=8
+KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target
diff --git a/src/provisioningserver/utils/service_monitor.py b/src/provisioningserver/utils/service_monitor.py
index 3f5e76f..139a73f 100644
--- a/src/provisioningserver/utils/service_monitor.py
+++ b/src/provisioningserver/utils/service_monitor.py
@@ -410,7 +410,7 @@ class ServiceMonitor:
             raise ServiceActionError(error_msg)
         yield self._performServiceAction(service, "reload")
 
-    def _execCmd(self, cmd, env, timeout=5):
+    def _execCmd(self, cmd, env, timeout=10):
 
         def decode(result):
             out, err, code = result