Merge ~bjornt/maas:bug-1867182-2.7 into maas:2.7

[Björn Tillenius]

LPP: #1867182 - When under load, MAAS snap keeps restarting services

Increase the timeout waiting for the the start/restart/status service
commands.

What happened before was that the start/restart command timed out, and
was re-executed. This served only to worsen the situation, since the
timeout stayed the same.

Given that the reason for having a timeout is to prevent a command from
hanging indefinitely, it's ok to have quite a high timeout. Having a
command hang completely is unlikely, and it's even more unlikely that a
retry will resolve the issue.

(cherry picked from commit 94b4fa43d5d0b0f1b9fe7c69a263173c30789627)

[Björn Tillenius (bjornt)]

Self-approve backport.

review: Approve

diff --git a/src/provisioningserver/utils/service_monitor.py b/src/provisioningserver/utils/service_monitor.py
index 5539dc7..5770f01 100644
--- a/src/provisioningserver/utils/service_monitor.py
+++ b/src/provisioningserver/utils/service_monitor.py
@@ -443,7 +443,7 @@ class ServiceMonitor:
         return state
 
     @inlineCallbacks
-    def _execCmd(self, cmd, env, timeout=8, retries=3):
+    def _execCmd(self, cmd, env, timeout=120, retries=3):
         """Execute the `cmd` with the `env`."""
 
         def decode(result):