From ddcb0638981b27a79125ff2764d4935204771e70 Mon Sep 17 00:00:00 2001 From: Felipe Cardozo Date: Mon, 25 Nov 2024 22:33:18 -0300 Subject: [PATCH] fix: shutdown of the cdk consumer (#4273) --- crates/cdk/src/deploy.rs | 4 ++-- crates/fluvio-connector-common/Cargo.toml | 2 +- tests/cli/cdk_smoke_tests/cdk-graceful-shutdown.bats | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/cdk/src/deploy.rs b/crates/cdk/src/deploy.rs index 8a24999cec..3778660815 100644 --- a/crates/cdk/src/deploy.rs +++ b/crates/cdk/src/deploy.rs @@ -359,7 +359,7 @@ mod local_index { use anyhow::{anyhow, Result}; use fluvio_connector_deployer::DeploymentResult; - use sysinfo::Pid; + use sysinfo::{Pid, Signal}; use tracing::debug; const LOCAL_INDEX_FILE_NAME: &str = "fluvio_cdk_deploy_index.toml"; @@ -515,7 +515,7 @@ mod local_index { } = entry; if let Some(process) = self.system.process(Pid::from_u32(*process_id)) { - process.kill(); + process.kill_with(Signal::Term); } Ok(()) diff --git a/crates/fluvio-connector-common/Cargo.toml b/crates/fluvio-connector-common/Cargo.toml index 5b8ed888f3..bc42f88c57 100644 --- a/crates/fluvio-connector-common/Cargo.toml +++ b/crates/fluvio-connector-common/Cargo.toml @@ -19,7 +19,7 @@ required-features = ["derive"] [dependencies] async-trait = { workspace = true } async-channel = { workspace = true } -ctrlc = { workspace = true } +ctrlc = { workspace = true, features = ["termination"]} anyhow = { workspace = true } futures = { workspace = true } futures-util = { workspace = true , features = ["sink"]} diff --git a/tests/cli/cdk_smoke_tests/cdk-graceful-shutdown.bats b/tests/cli/cdk_smoke_tests/cdk-graceful-shutdown.bats index f3fb6cff7e..d0ad92391d 100644 --- a/tests/cli/cdk_smoke_tests/cdk-graceful-shutdown.bats +++ b/tests/cli/cdk_smoke_tests/cdk-graceful-shutdown.bats @@ -45,7 +45,9 @@ meta: offset: strategy: auto start: beginning - flush: 10s + flush-period: + secs: 10 + nanos: 0 custom: api_key: api_key client_id: client_id