Stop stratisd-min from stratisd when stratisd is started

Author: jbaublitz

src/bin/stratisd.rs

@@ -13,10 +13,13 @@ use std::{
 
 use clap::{Arg, Command};
 use env_logger::Builder;
+use libc::pid_t;
 use log::LevelFilter;
 use nix::{
+    errno::Errno,
     fcntl::{flock, FlockArg},
-    unistd::getpid,
+    sys::signal::{kill, Signal},
+    unistd::{getpid, Pid},
 };
 
 use stratisd::stratis::{run, StratisError, StratisResult, VERSION};
@@ -78,7 +81,7 @@ fn trylock_pid_file() -> StratisResult<File> {
         }
     };
 
-    let f = OpenOptions::new()
+    let mut f = OpenOptions::new()
         .read(true)
         .write(true)
         .create(true)
@@ -91,6 +94,16 @@ fn trylock_pid_file() -> StratisResult<File> {
                 Box::new(StratisError::from(err)),
             )
         })?;
+
+    if let Err(Errno::EWOULDBLOCK) = flock(f.as_raw_fd(), FlockArg::LockExclusiveNonblock) {
+        let mut string = String::new();
+        f.read_to_string(&mut string)?;
+        let pid = string
+            .parse::<pid_t>()
+            .map_err(|_| StratisError::Msg(format!("Failed to parse {} as PID", string)))?;
+        kill(Pid::from_raw(pid), Signal::SIGINT)?;
+    }
+
     match flock(f.as_raw_fd(), FlockArg::LockExclusive) {
         Ok(_) => drop(f),
         Err(e) => {

systemd/stratisd-min-postinitrd.service.in

@@ -2,9 +2,9 @@
 Description=Stratis minimal daemon
 Documentation=man:stratisd(8)
 DefaultDependencies=no
-StopWhenUnneeded=true
 After=systemd-udevd.service
 Requires=systemd-udevd.service
+Before=local-fs.target
 
 [Service]
 Type=notify
@@ -14,3 +14,6 @@ ExecStart=@LIBEXECDIR@/stratisd-min --log-level debug
 KillSignal=SIGINT
 KillMode=process
 Restart=on-abort
+
+[Install]
+WantedBy=local-fs.target

systemd/stratisd.service.in

@@ -2,6 +2,7 @@
 Description=Stratis daemon
 Documentation=man:stratisd(8)
 DefaultDependencies=no
+After=sysinit.target
 
 [Service]
 BusName=org.storage.stratis3
@@ -13,4 +14,4 @@ KillMode=process
 Restart=on-abort
 
 [Install]
-WantedBy=sysinit.target
+WantedBy=multi-user.target