archive/pingora
1
0
Fork 0
mirror of https://github.com/cloudflare/pingora.git synced 2024-09-20 02:31:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add config for grace period and graceful shutdown timeout

Browse source
This commit is contained in:
Hiroaki Nakamura 2024-03-03 09:56:19 +09:00
parent 8797329225
commit f0dc59aeae
No known key found for this signature in database
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pingora-core/src/server/configuration/mod.rs
View file

@ -60,6 +60,10 @@ pub struct ServerConf {
/// The path to CA file the SSL library should use. If empty, the default trust store location
/// defined by the SSL library will be used.
pub ca_file: Option<String>,
/// Grace period in seconds before starting the final step of the graceful shutdown after signaling shutdown.
pub grace_period_seconds: Option<u64>,
/// Timeout in seconds of the final step for the graceful shutdown.
pub graceful_shutdown_timeout_seconds: Option<u64>,
// These options don't belong here as they are specific to certain services
pub(crate) client_bind_to_ipv4: Vec<String>,
pub(crate) client_bind_to_ipv6: Vec<String>,
@ -86,6 +90,8 @@ impl Default for ServerConf {
upstream_keepalive_pool_size: 128,
upstream_connect_offload_threadpools: None,
upstream_connect_offload_thread_per_pool: None,
grace_period_seconds: None,
graceful_shutdown_timeout_seconds: None,
}
}
}

16
pingora-core/src/server/mod.rs
View file

@ -302,15 +302,25 @@ impl Server {
let shutdown_type = server_runtime.get_handle().block_on(self.main_loop());
if matches!(shutdown_type, ShutdownType::Graceful) {
info!("Graceful shutdown: grace period {}s starts", EXIT_TIMEOUT);
thread::sleep(Duration::from_secs(EXIT_TIMEOUT));
let exit_timeout = self
.configuration
.as_ref()
.grace_period_seconds
.unwrap_or(EXIT_TIMEOUT);
info!("Graceful shutdown: grace period {}s starts", exit_timeout);
thread::sleep(Duration::from_secs(exit_timeout));
info!("Graceful shutdown: grace period ends");
}
// Give tokio runtimes time to exit
let shutdown_timeout = match shutdown_type {
ShutdownType::Quick => Duration::from_secs(0),
ShutdownType::Graceful => Duration::from_secs(5),
ShutdownType::Graceful => Duration::from_secs(
self.configuration
.as_ref()
.graceful_shutdown_timeout_seconds
.unwrap_or(5),
),
};
let shutdowns: Vec<_> = runtimes
.into_iter()