Skip to content

Commit 2f2dbbc

Browse files
committed
feat: Add graceful shutdown
1 parent 141f5d2 commit 2f2dbbc

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/hbase-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
@@ -28,6 +28,7 @@ use stackable_operator::{
2828
logging::controller::report_controller_reconciled,
2929
shared::yaml::SerializeOptions,
3030
telemetry::Tracing,
31+
utils::signal::SignalWatcher,
3132
};
3233

3334
use crate::crd::{HbaseCluster, HbaseClusterVersion, v1alpha1};
@@ -87,9 +88,13 @@ async fn main() -> anyhow::Result<()> {
8788
description = built_info::PKG_DESCRIPTION
8889
);
8990

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

95100
let product_config = product_config.load(&[
@@ -124,7 +129,6 @@ async fn main() -> anyhow::Result<()> {
124129
watch_namespace.get_api::<StatefulSet>(&client),
125130
watcher::Config::default(),
126131
)
127-
.shutdown_on_signal()
128132
.watches(
129133
watch_namespace.get_api::<DeserializeGuard<ConfigMap>>(&client),
130134
watcher::Config::default(),
@@ -136,6 +140,7 @@ async fn main() -> anyhow::Result<()> {
136140
.map(|hbase| ObjectRef::from_obj(&*hbase))
137141
},
138142
)
143+
.graceful_shutdown_on(sigterm_watcher.handle())
139144
.run(
140145
hbase_controller::reconcile_hbase,
141146
hbase_controller::error_policy,

0 commit comments

Comments
 (0)