Rely on shutdown ack from the master when shutting down

tinythings · Dec 14, 2024 · 02d5b7c · 02d5b7c
1 parent 21ceb9c
commit 02d5b7c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/libsysinspect/src/proto/rqtypes.rs b/libsysinspect/src/proto/rqtypes.rs
@@ -30,6 +30,10 @@ pub enum RequestType {
     #[serde(rename = "b")]
     Bye,
 
+    /// Bye Ack
+    #[serde(rename = "ba")]
+    ByeAck,
+
     /// Retry connect (e.g. after the registration)
     #[serde(rename = "retry")]
     Reconnect,

diff --git a/sysmaster/src/master.rs b/sysmaster/src/master.rs
@@ -184,6 +184,14 @@ impl SysMaster {
         m
     }
 
+    fn msg_bye_ack(&mut self, mid: String, sid: String) -> MasterMessage {
+        let mut m = MasterMessage::new(RequestType::ByeAck, json!(sid));
+        m.set_target(MinionTarget::new(&mid, &sid));
+        m.set_retcode(ProtoErrorCode::Success);
+
+        m
+    }
+
     pub fn get_session(&self) -> Arc<Mutex<session::SessionKeeper>> {
         Arc::clone(&self.session)
     }
@@ -282,10 +290,13 @@ impl SysMaster {
 
                             RequestType::Bye => {
                                 let c_master = Arc::clone(&master);
+                                let c_bcast = bcast.clone();
                                 log::info!("Minion {} disconnects", req.id());
                                 tokio::spawn(async move {
-                                    let guard = c_master.lock().await;
+                                    let mut guard = c_master.lock().await;
                                     guard.get_session().lock().await.remove(req.id());
+                                    let m = guard.msg_bye_ack(req.id().to_string(), req.payload().to_string());
+                                    _ = c_bcast.send(m.sendable().unwrap());
                                 });
                             }
 

diff --git a/sysminion/src/minion.rs b/sysminion/src/minion.rs
@@ -15,7 +15,7 @@ use libsysinspect::{
     SysinspectError,
 };
 use once_cell::sync::Lazy;
-use std::{fs, sync::Arc, time::Duration, vec};
+use std::{fs, sync::Arc, vec};
 use tokio::io::AsyncReadExt;
 use tokio::net::{tcp::OwnedReadHalf, TcpStream};
 use tokio::sync::Mutex;
@@ -219,6 +219,10 @@ impl SysMinion {
                     RequestType::Ping => {
                         self.request(proto::msg::get_pong()).await;
                     }
+                    RequestType::ByeAck => {
+                        log::info!("Master confirmed shutdown, terminating");
+                        std::process::exit(0);
+                    }
                     _ => {
                         log::error!("Unknown request type");
                     }
@@ -388,10 +392,8 @@ impl SysMinion {
         let cmd = cmd.strip_prefix(SCHEME_COMMAND).unwrap_or_default();
         match cmd {
             libsysinspect::proto::query::commands::CLUSTER_SHUTDOWN => {
-                log::info!("Shutting down minion");
+                log::info!("Requesting minion shutdown from a master");
                 self.as_ptr().send_bye().await;
-                tokio::time::sleep(Duration::from_secs(2)).await;
-                std::process::exit(0);
             }
             libsysinspect::proto::query::commands::CLUSTER_REBOOT => {
                 log::warn!("Command \"reboot\" is not implemented yet");