XSI-1773 clean up swtpm service files

We have seen swtpm systemd service files not being removed. We now call Fe_systemctl.stop even when the servive is potentially not running to ensure clean up is happening regardless. Signed-off-by: Christian Lindig <[email protected]>
xapi-project · Dec 20, 2024 · 3d394e0 · 3d394e0
1 parent 90b0faf
commit 3d394e0
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/ocaml/xenopsd/xc/service.ml b/ocaml/xenopsd/xc/service.ml
@@ -608,26 +608,17 @@ module SystemdDaemonMgmt (D : DAEMONPIDPATH) = struct
     else
       None
 
-  let is_running ~xs domid =
-    match of_domid domid with
-    | None ->
-        Compat.is_running ~xs domid
-    | Some key ->
-        Fe_systemctl.is_active ~service:key
-
   let stop ~xs domid =
-    match (of_domid domid, is_running ~xs domid) with
-    | None, true ->
+    match of_domid domid with
+    | None when Compat.is_running ~xs domid ->
         Compat.stop ~xs domid
-    | Some service, true ->
-        (* xenstore cleanup is done by systemd unit file *)
-        let (_ : Fe_systemctl.status) = Fe_systemctl.stop ~service in
-        ()
-    | Some service, false ->
-        info "Not trying to stop %s since it's not running" service
-    | None, false ->
+    | None ->
         info "Not trying to stop %s for domid %i since it's not running" D.name
           domid
+    | Some service ->
+        (* call even when not running for clean up *)
+        let (_ : Fe_systemctl.status) = Fe_systemctl.stop ~service in
+        ()
 
   let start_daemon ~path ~args ~domid () =
     debug "Starting daemon: %s with args [%s]" path (String.concat "; " args) ;