refactor to use two flags

Author: DominicBurkart

src/app.rs

@@ -1,5 +1,5 @@
 #![allow(missing_docs)]
-use std::{collections::HashMap, num::NonZeroUsize, path::PathBuf};
+use std::{collections::HashMap, num::NonZeroUsize, path::PathBuf, time::Duration};
 
 use exitcode::ExitCode;
 use futures::StreamExt;
@@ -62,11 +62,17 @@ impl ApplicationConfig {
     ) -> Result<Self, ExitCode> {
         let config_paths = opts.config_paths_with_formats();
 
+        let graceful_shutdown_duration = if opts.no_forced_shutdown {
+            None
+        } else {
+            Some(Duration::from_secs(opts.graceful_shutdown_duration))
+        };
+
         let config = load_configs(
             &config_paths,
             opts.watch_config,
             opts.require_healthy,
-            opts.graceful_shutdown_duration,
+            graceful_shutdown_duration,
             signal_handler,
         )
         .await?;
@@ -411,7 +417,7 @@ pub async fn load_configs(
     config_paths: &[ConfigPath],
     watch_config: bool,
     require_healthy: Option<bool>,
-    graceful_shutdown_duration: i64,
+    graceful_shutdown_duration: Option<Duration>,
     signal_handler: &mut SignalHandler,
 ) -> Result<Config, ExitCode> {
     let config_paths = config::process_paths(config_paths).ok_or(exitcode::CONFIG)?;

src/cli.rs

@@ -160,10 +160,24 @@ pub struct RootOpts {
     pub internal_log_rate_limit: u64,
 
     /// Set the duration in seconds to wait for graceful shutdown after SIGINT or SIGTERM are received.
-    /// After the duration has passed, Vector will force shutdown. Default value is 60 seconds. If set
-    /// to -1, Vector will never force shutdown.
-    #[arg(long, default_value = "60", env = "VECTOR_GRACEFUL_SHUTDOWN_DURATION", value_parser = clap::value_parser!(i64).range(-1..))]
-    pub graceful_shutdown_duration: i64,
+    /// After the duration has passed, Vector will force shutdown.
+    #[arg(
+        long,
+        default_value = "60",
+        env = "VECTOR_GRACEFUL_SHUTDOWN_DURATION",
+        group = "graceful-shutdown-duration"
+    )]
+    pub graceful_shutdown_duration: u64,
+
+    /// Never time out while waiting for graceful shutdown after SIGINT or SIGTERM received. This is useful
+    /// when you would like for Vector to attempt to send data until terminated by a SIGKILL.
+    #[arg(
+        long,
+        default_value = "false",
+        env = "VECTOR_GRACEFUL_SHUTDOWN_DURATION",
+        group = "graceful-shutdown-duration"
+    )]
+    pub no_forced_shutdown: bool,
 
     /// Set runtime allocation tracing
     #[cfg(feature = "allocation-tracing")]

src/config/builder.rs

@@ -1,6 +1,6 @@
 #[cfg(feature = "enterprise")]
 use std::collections::BTreeMap;
-use std::path::Path;
+use std::{path::Path, time::Duration};
 
 use indexmap::IndexMap;
 #[cfg(feature = "enterprise")]
@@ -85,7 +85,7 @@ pub struct ConfigBuilder {
     /// [cli arg](crate::cli::RootOpts::graceful_shutdown_duration).
     #[serde(default, skip)]
     #[doc(hidden)]
-    pub graceful_shutdown_duration: i64,
+    pub graceful_shutdown_duration: Option<Duration>,
 }
 
 #[cfg(feature = "enterprise")]

src/config/mod.rs

@@ -5,6 +5,7 @@ use std::{
     hash::Hash,
     net::SocketAddr,
     path::PathBuf,
+    time::Duration,
 };
 
 use indexmap::IndexMap;
@@ -103,7 +104,7 @@ pub struct Config {
     pub enrichment_tables: IndexMap<ComponentKey, EnrichmentTableOuter>,
     tests: Vec<TestDefinition>,
     secret: IndexMap<ComponentKey, SecretBackends>,
-    pub graceful_shutdown_duration: i64,
+    pub graceful_shutdown_duration: Option<Duration>,
 }
 
 impl Config {

src/topology/running.rs

@@ -62,10 +62,7 @@ impl RunningTopology {
             abort_tx,
             watch: watch::channel(TapResource::default()),
             running: Arc::new(AtomicBool::new(true)),
-            graceful_shutdown_duration: match config.graceful_shutdown_duration {
-                -1 => None,
-                seconds => Some(Duration::from_secs(seconds as u64)), // clap validator makes sure value is >= -1
-            },
+            graceful_shutdown_duration: config.graceful_shutdown_duration,
             config,
         }
     }