snap/hooks/pre-refresh: Add timeout to *-appctl calls.

In the event the `ovn-controller` or `ovs-vswitchd` daemons fail to service a request on the control socket, the appctl program may hang indefinitely. Add the `--timeout` option to the *-appctl calls to avoid this problem. Closes-Bug: #2045865 Signed-off-by: Frode Nordahl <[email protected]> (cherry picked from commit c5e5a2c)
canonical · Dec 7, 2023 · 9df9682 · 9df9682
1 parent 1d18f95
commit 9df9682
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/snap/hooks/pre-refresh b/snap/hooks/pre-refresh
@@ -1,13 +1,17 @@
 #!/bin/sh
 
+# The amout of time to wait in seconds for the case where the app socket
+# accepts connections and the daemon for some reason does not service requests.
+TIMEOUT=30
+
 # NOTE(fnordahl): tell the ovn-controller to exit without cleaning up flows nor
 # SB DB state on refresh.
-${SNAP}/commands/ovn-appctl exit --restart || true
+${SNAP}/commands/ovn-appctl --timeout ${TIMEOUT} exit --restart || true
 
 # Note (mkalcok): `microovn.switch` service, by default, stops OVS
 # vswitch daemon with `--cleanup` flag that releases datapath
 # resources like ports and bridges. This hook prevents such behavior
 # by stopping the daemon without `--cleanup` flag during the snap
 # refresh.
 
-${SNAP}/commands/ovs-appctl exit || true
+${SNAP}/commands/ovs-appctl --timeout ${TIMEOUT} exit || true