Skip to content

Commit 5b8254a

Browse files
committed
feat: Add graceful shutdown
1 parent af08482 commit 5b8254a

5 files changed

Lines changed: 38 additions & 33 deletions

File tree

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/hive-operator"
1111

1212
[workspace.dependencies]
1313
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
14-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.102.0", features = ["telemetry", "versioned"] }
14+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.105.0", features = ["telemetry", "versioned"] }
1515

1616
anyhow = "1.0"
1717
built = { version = "0.8", features = ["chrono", "git2"] }

crate-hashes.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/operator-binary/src/main.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ use stackable_operator::{
3838
logging::controller::report_controller_reconciled,
3939
shared::yaml::SerializeOptions,
4040
telemetry::Tracing,
41+
utils::signal::SignalWatcher,
4142
};
4243

4344
use crate::{
@@ -88,9 +89,13 @@ async fn main() -> anyhow::Result<()> {
8889
description = built_info::PKG_DESCRIPTION
8990
);
9091

92+
// Watches for the SIGTERM signal and sends a signal to all receivers, which gracefully
93+
// shuts down all concurrent tasks below (EoS checker, controller).
94+
let sigterm_watcher = SignalWatcher::sigterm()?;
95+
9196
let eos_checker =
9297
EndOfSupportChecker::new(built_info::BUILT_TIME_UTC, maintenance.end_of_support)?
93-
.run()
98+
.run(sigterm_watcher.handle())
9499
.map(anyhow::Ok);
95100

96101
let product_config = product_config.load(&[
@@ -129,7 +134,6 @@ async fn main() -> anyhow::Result<()> {
129134
watch_namespace.get_api::<ConfigMap>(&client),
130135
watcher::Config::default(),
131136
)
132-
.shutdown_on_signal()
133137
.watches(
134138
watch_namespace.get_api::<DeserializeGuard<ConfigMap>>(&client),
135139
watcher::Config::default(),
@@ -141,6 +145,7 @@ async fn main() -> anyhow::Result<()> {
141145
.map(|hive| ObjectRef::from_obj(&*hive))
142146
},
143147
)
148+
.graceful_shutdown_on(sigterm_watcher.handle())
144149
.run(
145150
controller::reconcile_hive,
146151
controller::error_policy,

0 commit comments

Comments
 (0)