Skip to content

fix: Set correct schema in startup probe #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2025
Merged

fix: Set correct schema in startup probe #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53e8897
fix: Set correct schema in startup probe
sbernauer Mar 10, 2025
67431ca
changelog
sbernauer Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ All notable changes to this project will be documented in this file.
### Fixed

- Add a startupProbe, which checks via `/v1/info` that the coordinator/worker have finished starting.
Also migrate the other probes from `tcpSocket` to `httpGet` on `/v1/info` ([#715]).
Also migrate the other probes from `tcpSocket` to `httpGet` on `/v1/info` ([#715], [#717]).

[#676]: https://github.com/stackabletech/trino-operator/pull/676
[#677]: https://github.com/stackabletech/trino-operator/pull/677
[#687]: https://github.com/stackabletech/trino-operator/pull/687
[#694]: https://github.com/stackabletech/trino-operator/pull/694
[#695]: https://github.com/stackabletech/trino-operator/pull/695
[#715]: https://github.com/stackabletech/trino-operator/pull/715
[#717]: https://github.com/stackabletech/trino-operator/pull/717

## [24.11.1] - 2025-01-10

Expand Down
45 changes: 8 additions & 37 deletions Cargo.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion rust/operator-binary/src/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,14 +1545,20 @@ fn http_get_probe(trino: &v1alpha1::TrinoCluster) -> HTTPGetAction {
/// This probe works on coordinators and workers.
fn finished_starting_probe(trino: &v1alpha1::TrinoCluster) -> ExecAction {
let port = trino.exposed_port();
let schema = if trino.expose_https_port() {
"https"
} else {
"http"
};

ExecAction {
command: Some(vec![
"/bin/bash".to_string(),
"-x".to_string(),
"-euo".to_string(),
"pipefail".to_string(),
"-c".to_string(),
format!("curl --fail --insecure https://127.0.0.1:{port}/v1/info | grep --silent '\\\"starting\\\":false'"),
format!("curl --fail --insecure {schema}://127.0.0.1:{port}/v1/info | grep --silent '\\\"starting\\\":false'"),
]),
}
}
Expand Down