itsi-server 0.1.9 → 0.1.11

data/ext/itsi_server/src/server/listener.rs

@@ -243,20 +243,20 @@ impl std::fmt::Display for SockAddr {
 }
 
 impl Listener {
-    pub fn to_tokio_listener(&self) -> TokioListener {
+    pub fn into_tokio_listener(self) -> TokioListener {
         match self {
-            Listener::Tcp(listener) => TokioListener::Tcp(
-                TokioTcpListener::from_std(TcpListener::try_clone(listener).unwrap()).unwrap(),
-            ),
+            Listener::Tcp(listener) => {
+                TokioListener::Tcp(TokioTcpListener::from_std(listener).unwrap())
+            }
             Listener::TcpTls((listener, acceptor)) => TokioListener::TcpTls(
-                TokioTcpListener::from_std(TcpListener::try_clone(listener).unwrap()).unwrap(),
+                TokioTcpListener::from_std(listener).unwrap(),
                 acceptor.clone(),
             ),
-            Listener::Unix(listener) => TokioListener::Unix(
-                TokioUnixListener::from_std(UnixListener::try_clone(listener).unwrap()).unwrap(),
-            ),
+            Listener::Unix(listener) => {
+                TokioListener::Unix(TokioUnixListener::from_std(listener).unwrap())
+            }
             Listener::UnixTls((listener, acceptor)) => TokioListener::UnixTls(
-                TokioUnixListener::from_std(UnixListener::try_clone(listener).unwrap()).unwrap(),
+                TokioUnixListener::from_std(listener).unwrap(),
                 acceptor.clone(),
             ),
         }

data/ext/itsi_server/src/server/process_worker.rs

@@ -53,8 +53,8 @@ impl ProcessWorker {
             }
             *self.child_pid.lock() = None;
         }
-
-        match call_with_gvl(|_ruby| fork(cluster_template.server.after_fork.lock().clone())) {
+        match call_with_gvl(|_ruby| fork(cluster_template.server.hooks.get("after_fork").cloned()))
+        {
             Some(pid) => {
                 *self.child_pid.lock() = Some(Pid::from_raw(pid));
             }
@@ -67,7 +67,7 @@ impl ProcessWorker {
                 }
                 match SingleMode::new(
                     cluster_template.server.clone(),
-                    cluster_template.listeners.clone(),
+                    cluster_template.listeners.lock().drain(..).collect(),
                     cluster_template.lifecycle_channel.clone(),
                 ) {
                     Ok(single_mode) => {
@@ -83,6 +83,13 @@ impl ProcessWorker {
         Ok(())
     }
 
+    pub fn pid(&self) -> i32 {
+        if let Some(pid) = *self.child_pid.lock() {
+            return pid.as_raw();
+        }
+        0
+    }
+
     pub(crate) fn memory_usage(&self) -> Option<u64> {
         if let Some(pid) = *self.child_pid.lock() {
             let s = System::new_all();

data/ext/itsi_server/src/server/serve_strategy/cluster_mode.rs

@@ -3,8 +3,11 @@ use crate::server::{
     process_worker::ProcessWorker,
 };
 use itsi_error::{ItsiError, Result};
-use itsi_rb_helpers::{call_without_gvl, create_ruby_thread};
+use itsi_rb_helpers::{
+    call_proc_and_log_errors, call_with_gvl, call_without_gvl, create_ruby_thread,
+};
 use itsi_tracing::{error, info, warn};
+use magnus::Value;
 use nix::{
     libc::{self, exit},
     unistd::Pid,
@@ -19,9 +22,9 @@ use tokio::{
     sync::{broadcast, watch, Mutex},
     time::{self, sleep},
 };
-use tracing::instrument;
+use tracing::{debug, instrument};
 pub(crate) struct ClusterMode {
-    pub listeners: Arc<Vec<Arc<Listener>>>,
+    pub listeners: parking_lot::Mutex<Vec<Listener>>,
     pub server: Arc<Server>,
     pub process_workers: parking_lot::Mutex<Vec<ProcessWorker>>,
     pub lifecycle_channel: broadcast::Sender<LifecycleEvent>,
@@ -34,12 +37,9 @@ static CHILD_SIGNAL_SENDER: parking_lot::Mutex<Option<watch::Sender<()>>> =
 impl ClusterMode {
     pub fn new(
         server: Arc<Server>,
-        listeners: Arc<Vec<Arc<Listener>>>,
+        listeners: Vec<Listener>,
         lifecycle_channel: broadcast::Sender<LifecycleEvent>,
     ) -> Self {
-        if let Some(f) = server.before_fork.lock().take() {
-            f();
-        }
         let process_workers = (0..server.workers)
             .map(|_| ProcessWorker {
                 worker_id: WORKER_ID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
@@ -48,7 +48,7 @@ impl ClusterMode {
             .collect();
 
         Self {
-            listeners,
+            listeners: parking_lot::Mutex::new(listeners),
             server,
             process_workers: parking_lot::Mutex::new(process_workers),
             lifecycle_channel,
@@ -152,7 +152,7 @@ impl ClusterMode {
 
         tokio::select! {
             _ = monitor_handle => {
-              info!("All children exited early, exit normally")
+              debug!("All children exited early, exit normally")
             }
             _ = sleep(Duration::from_secs_f64(shutdown_timeout)) => {
                 warn!("Graceful shutdown timeout reached, force killing remaining children");
@@ -191,6 +191,9 @@ impl ClusterMode {
     #[instrument(skip(self), fields(mode = "cluster", pid=format!("{:?}", Pid::this())))]
     pub fn run(self: Arc<Self>) -> Result<()> {
         info!("Starting in Cluster mode");
+        if let Some(proc) = self.server.hooks.get("before_fork") {
+            call_with_gvl(|_| call_proc_and_log_errors(proc.clone()))
+        }
         self.process_workers
             .lock()
             .iter()
@@ -228,6 +231,9 @@ impl ClusterMode {
                     if let Some(current_mem_usage) = largest_worker.memory_usage(){
                       if current_mem_usage > memory_limit {
                         largest_worker.reboot(self_ref.clone()).await.ok();
+                        if let Some(hook) = self_ref.server.hooks.get("after_memory_threshold_reached") {
+                          call_with_gvl(|_|  hook.call::<_, Value>((largest_worker.pid(),)).ok() );
+                        }
                       }
                     }
                   }

data/ext/itsi_server/src/server/serve_strategy/single_mode.rs

@@ -15,10 +15,13 @@ use hyper_util::{
     server::conn::auto::Builder,
 };
 use itsi_error::{ItsiError, Result};
+use itsi_rb_helpers::print_rb_backtrace;
 use itsi_tracing::{debug, error, info};
 use nix::unistd::Pid;
+use parking_lot::Mutex;
 use std::{
     num::NonZeroU8,
+    panic,
     pin::Pin,
     sync::Arc,
     time::{Duration, Instant},
@@ -37,7 +40,7 @@ pub struct SingleMode {
     pub executor: Builder<TokioExecutor>,
     pub server: Arc<Server>,
     pub sender: async_channel::Sender<RequestJob>,
-    pub(crate) listeners: Arc<Vec<Arc<Listener>>>,
+    pub(crate) listeners: Mutex<Vec<Listener>>,
     pub(crate) thread_workers: Arc<Vec<ThreadWorker>>,
     pub(crate) lifecycle_channel: broadcast::Sender<LifecycleEvent>,
 }
@@ -52,18 +55,24 @@ impl SingleMode {
     #[instrument(parent=None, skip_all, fields(pid=format!("{:?}", Pid::this())))]
     pub(crate) fn new(
         server: Arc<Server>,
-        listeners: Arc<Vec<Arc<Listener>>>,
+        listeners: Vec<Listener>,
         lifecycle_channel: broadcast::Sender<LifecycleEvent>,
     ) -> Result<Self> {
         let (thread_workers, sender) = build_thread_workers(
+            server.clone(),
             Pid::this(),
             NonZeroU8::try_from(server.threads).unwrap(),
             server.app.clone(),
             server.scheduler_class.clone(),
-        )?;
+        )
+        .inspect_err(|e| {
+            if let Some(err_val) = e.value() {
+                print_rb_backtrace(err_val);
+            }
+        })?;
         Ok(Self {
             executor: Builder::new(TokioExecutor::new()),
-            listeners,
+            listeners: Mutex::new(listeners),
             server,
             sender,
             thread_workers,
@@ -83,82 +92,81 @@ impl SingleMode {
     }
 
     pub fn stop(&self) -> Result<()> {
-        self.lifecycle_channel
-            .send(LifecycleEvent::Shutdown)
-            .expect("Failed to send shutdown event");
+        self.lifecycle_channel.send(LifecycleEvent::Shutdown).ok();
         Ok(())
     }
 
     #[instrument(parent=None, skip(self), fields(pid=format!("{}", Pid::this())))]
     pub fn run(self: Arc<Self>) -> Result<()> {
         let mut listener_task_set = JoinSet::new();
-        let self_ref = Arc::new(self);
-        let runtime = self_ref.build_runtime();
+        let runtime = self.build_runtime();
 
         runtime.block_on(async {
-          let tokio_listeners = self_ref
-              .listeners
-              .iter()
-              .map(|list| Arc::new(list.to_tokio_listener()))
-              .collect::<Vec<_>>();
-          let (shutdown_sender, _) = watch::channel::<RunningPhase>(RunningPhase::Running);
-          for listener in tokio_listeners.iter() {
-              let mut lifecycle_rx = self_ref.lifecycle_channel.subscribe();
-              let listener_info = Arc::new(listener.listener_info());
-              let self_ref = self_ref.clone();
-              let listener = listener.clone();
-              let shutdown_sender = shutdown_sender.clone();
-
+              let tokio_listeners = self
+                  .listeners.lock()
+                  .drain(..)
+                  .map(|list| {
+                    Arc::new(list.into_tokio_listener())
+                  })
+                  .collect::<Vec<_>>();
+              let (shutdown_sender, _) = watch::channel(RunningPhase::Running);
+              for listener in tokio_listeners.iter() {
+                  let mut lifecycle_rx = self.lifecycle_channel.subscribe();
+                  let listener_info = Arc::new(listener.listener_info());
+                  let self_ref = self.clone();
+                  let listener = listener.clone();
+                  let shutdown_sender = shutdown_sender.clone();
 
-              let listener_clone = listener.clone();
-              let mut shutdown_receiver = shutdown_sender.clone().subscribe();
-              let shutdown_receiver_clone = shutdown_receiver.clone();
-              listener_task_set.spawn(async move {
-                listener_clone.spawn_state_task(shutdown_receiver_clone).await;
-              });
+                  let listener_clone = listener.clone();
+                  let mut shutdown_receiver = shutdown_sender.subscribe();
+                  let shutdown_receiver_clone = shutdown_receiver.clone();
+                  listener_task_set.spawn(async move {
+                    listener_clone.spawn_state_task(shutdown_receiver_clone).await;
+                  });
 
-              listener_task_set.spawn(async move {
-                let strategy = self_ref.clone();
-                loop {
-                    tokio::select! {
-                        accept_result = listener.accept() => match accept_result {
-                          Ok(accept_result) => {
-                            match strategy.serve_connection(accept_result, listener_info.clone(), shutdown_receiver.clone()).await {
-                              Ok(_) => {
-                                debug!("Connection accepted and served");
+                  listener_task_set.spawn(async move {
+                    let strategy_clone = self_ref.clone();
+                    let mut acceptor_task_set = JoinSet::new();
+                    loop {
+                        tokio::select! {
+                            accept_result = listener.accept() => match accept_result {
+                              Ok(accept_result) => {
+                                let strategy = strategy_clone.clone();
+                                let listener_info = listener_info.clone();
+                                let shutdown_receiver = shutdown_receiver.clone();
+                                acceptor_task_set.spawn(async move {
+                                  strategy.serve_connection(accept_result, listener_info, shutdown_receiver).await;
+                                });
                               },
-                              Err(e) => error!("Error in serve_connection {:?}", e)
-                            }
-                          },
-                          Err(e) => debug!("Listener.accept failed {:?}", e),
-                        },
-                        _ = shutdown_receiver.changed() => {
-                          break;
-                        }
-                        lifecycle_event = lifecycle_rx.recv() => match lifecycle_event{
-                          Ok(lifecycle_event) => {
-                            if let Err(e) = strategy.handle_lifecycle_event(lifecycle_event, shutdown_sender.clone()).await{
-                              match e {
-                                ItsiError::Break() => break,
-                                _ => error!("Error in handle_lifecycle_event {:?}", e)
-                              }
+                              Err(e) => debug!("Listener.accept failed {:?}", e),
+                            },
+                            _ = shutdown_receiver.changed() => {
+                              break;
                             }
+                            lifecycle_event = lifecycle_rx.recv() => match lifecycle_event{
+                              Ok(lifecycle_event) => {
+                                if let Err(e) = self_ref.handle_lifecycle_event(lifecycle_event, shutdown_sender.clone()).await{
+                                  match e {
+                                    ItsiError::Break() => break,
+                                    _ => error!("Error in handle_lifecycle_event {:?}", e)
+                                  }
+                                }
 
-                          },
-                          Err(e) => error!("Error receiving lifecycle_event: {:?}", e),
-                      }
+                              },
+                              Err(e) => error!("Error receiving lifecycle_event: {:?}", e),
+                          }
+                        }
                     }
-                }
-            });
+                    while let Some(_res) = acceptor_task_set.join_next().await {}
+                });
 
-          }
+              }
 
-          while let Some(_res) = listener_task_set.join_next().await {}
+              while let Some(_res) = listener_task_set.join_next().await {}
 
-        });
+            });
         runtime.shutdown_timeout(Duration::from_millis(100));
-
-        info!("Runtime has shut down");
+        debug!("Runtime has shut down");
         Ok(())
     }
 
@@ -167,62 +175,60 @@ impl SingleMode {
         stream: IoStream,
         listener: Arc<ListenerInfo>,
         shutdown_channel: watch::Receiver<RunningPhase>,
-    ) -> Result<()> {
+    ) {
         let sender_clone = self.sender.clone();
         let addr = stream.addr();
         let io: TokioIo<Pin<Box<IoStream>>> = TokioIo::new(Box::pin(stream));
         let server = self.server.clone();
         let executor = self.executor.clone();
         let mut shutdown_channel_clone = shutdown_channel.clone();
-        tokio::spawn(async move {
-            let server = server.clone();
-            let mut executor = executor.clone();
-            let mut binding = executor.http1();
-            let shutdown_channel = shutdown_channel_clone.clone();
-            let mut serve = Box::pin(
-                binding
-                    .timer(TokioTimer::new())
-                    .header_read_timeout(Duration::from_secs(1))
-                    .serve_connection_with_upgrades(
-                        io,
-                        service_fn(move |hyper_request: Request<Incoming>| {
-                            ItsiRequest::process_request(
-                                hyper_request,
-                                sender_clone.clone(),
-                                server.clone(),
-                                listener.clone(),
-                                addr.clone(),
-                                shutdown_channel.clone(),
-                            )
-                        }),
-                    ),
-            );
+        let server = server.clone();
+        let mut executor = executor.clone();
+        let mut binding = executor.http1();
+        let shutdown_channel = shutdown_channel_clone.clone();
+        let mut serve = Box::pin(
+            binding
+                .timer(TokioTimer::new())
+                .header_read_timeout(Duration::from_secs(1))
+                .serve_connection_with_upgrades(
+                    io,
+                    service_fn(move |hyper_request: Request<Incoming>| {
+                        ItsiRequest::process_request(
+                            hyper_request,
+                            sender_clone.clone(),
+                            server.clone(),
+                            listener.clone(),
+                            addr.clone(),
+                            shutdown_channel.clone(),
+                        )
+                    }),
+                ),
+        );
 
-            tokio::select! {
-                // Await the connection finishing naturally.
-                res = &mut serve => {
-                    match res{
-                        Ok(()) => {
-                          debug!("Connection closed normally")
-                        },
-                        Err(res) => {
-                          debug!("Connection finished with error: {:?}", res)
-                        }
-                    }
-                    serve.as_mut().graceful_shutdown();
-                },
-                // A lifecycle event triggers shutdown.
-                _ = shutdown_channel_clone.changed() => {
-                    // Initiate graceful shutdown.
-                    serve.as_mut().graceful_shutdown();
-                    // Now await the connection to finish shutting down.
-                    if let Err(e) = serve.await {
-                        debug!("Connection shutdown error: {:?}", e);
+        tokio::select! {
+            // Await the connection finishing naturally.
+            res = &mut serve => {
+                match res{
+                    Ok(()) => {
+                      debug!("Connection closed normally")
+                    },
+                    Err(res) => {
+                      debug!("Connection finished with error: {:?}", res)
                     }
                 }
+                serve.as_mut().graceful_shutdown();
+            },
+            // A lifecycle event triggers shutdown.
+            _ = shutdown_channel_clone.changed() => {
+                // Initiate graceful shutdown.
+                serve.as_mut().graceful_shutdown();
+
+                // Now await the connection to finish shutting down.
+                if let Err(e) = serve.await {
+                    debug!("Connection shutdown error: {:?}", e);
+                }
             }
-        });
-        Ok(())
+        }
     }
 
     pub async fn handle_lifecycle_event(
@@ -232,13 +238,20 @@ impl SingleMode {
     ) -> Result<()> {
         info!("Handling lifecycle event: {:?}", lifecycle_event);
         if let LifecycleEvent::Shutdown = lifecycle_event {
+            //1. Stop accepting new connections.
             shutdown_sender.send(RunningPhase::ShutdownPending).ok();
-            let deadline = Instant::now() + Duration::from_secs_f64(self.server.shutdown_timeout);
+            tokio::time::sleep(Duration::from_millis(25)).await;
+
+            //2. Break out of work queues.
             for worker in &*self.thread_workers {
                 worker.request_shutdown().await;
             }
+
+            tokio::time::sleep(Duration::from_millis(25)).await;
+
+            //3. Wait for all threads to finish.
+            let deadline = Instant::now() + Duration::from_secs_f64(self.server.shutdown_timeout);
             while Instant::now() < deadline {
-                tokio::time::sleep(Duration::from_millis(50)).await;
                 let alive_threads = self
                     .thread_workers
                     .iter()
@@ -250,7 +263,7 @@ impl SingleMode {
                 tokio::time::sleep(Duration::from_millis(200)).await;
             }
 
-            info!("Sending shutdown signal");
+            //4. Force shutdown any stragglers
             shutdown_sender.send(RunningPhase::Shutdown).ok();
             self.thread_workers.iter().for_each(|worker| {
                 worker.poll_shutdown(deadline);

data/ext/itsi_server/src/server/signal.rs

@@ -11,10 +11,7 @@ pub static SIGNAL_HANDLER_CHANNEL: LazyLock<(
 )> = LazyLock::new(|| sync::broadcast::channel(5));
 
 pub fn send_shutdown_event() {
-    SIGNAL_HANDLER_CHANNEL
-        .0
-        .send(LifecycleEvent::Shutdown)
-        .expect("Failed to send shutdown event");
+    SIGNAL_HANDLER_CHANNEL.0.send(LifecycleEvent::Shutdown).ok();
 }
 
 pub static SIGINT_COUNT: AtomicI8 = AtomicI8::new(0);