Wait for local Supervisor startup during svc load - #10388
Open
officialasishkumar wants to merge 2 commits into
Open
Wait for local Supervisor startup during svc load#10388officialasishkumar wants to merge 2 commits into
officialasishkumar wants to merge 2 commits into
Conversation
Contributor
|
Hello officialasishkumar! Thanks for the pull request! Here is what will happen next:
Thank you for contributing! |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves hab svc load behavior when targeting a local Supervisor whose control gateway is temporarily unavailable during startup, by detecting a recent Supervisor LOCK file and retrying briefly instead of immediately failing with a generic connection-refused error.
Changes:
- Add
gateway_util::send_waiting_for_startupto retry on localConnectionRefusedwhen a recent SupervisorLOCKfile suggests startup is in progress. - Emit a one-time warning while waiting, then retry until success or a startup-wait timeout.
- Update
hab svc load(CLI v4) to use the new startup-waiting send path and add unit tests for lock-file detection logic.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| components/hab/src/gateway_util.rs | Adds local-startup wait/retry logic keyed off a recent Supervisor LOCK file, plus unit tests. |
| components/hab/src/cli_v4/svc/load.rs | Routes hab svc load through the new startup-waiting gateway helper. |
Comment on lines
+58
to
+70
|
|
||
| loop { | ||
| match send(remote_sup_addr, msg.clone()).await { | ||
| Err(crate::error::Error::CtlClient(SrvClientError::ConnectionRefused)) | ||
| if should_wait_for_local_supervisor_startup(remote_sup_addr, start.elapsed()) => | ||
| { | ||
| if !warned { | ||
| let mut ui = UI::default_with_env(); | ||
| let _ = ui.warn("The local Supervisor is not accepting commands yet; \ | ||
| waiting for it to finish starting."); | ||
| warned = true; | ||
| } | ||
| tokio::time::sleep(SUPERVISOR_STARTUP_RETRY_INTERVAL).await; |
Author
There was a problem hiding this comment.
Addressed in c4ef262: the lock-file freshness check is evaluated once, and retries are then gated by the startup wait window.
Comment on lines
+164
to
+166
| assert!(has_recent_supervisor_lock_file(&lock_file, Duration::from_secs(60))); | ||
| assert!(!has_recent_supervisor_lock_file(&lock_file, Duration::ZERO)); | ||
| } |
Author
There was a problem hiding this comment.
Addressed in c4ef262: replaced the Duration::ZERO assertion with a small positive threshold after a short sleep.
Retry hab svc load while a local Supervisor lock file indicates startup is in progress. The command now warns once and waits briefly for the control gateway instead of immediately returning a connection-refused error.
Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
officialasishkumar
force-pushed
the
retry-svc-load-during-startup
branch
from
May 13, 2026 07:04
46d1b68 to
c4ef262
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
hab svc loadretry briefly when the local Supervisor control gateway refuses connections while a recent SupervisorLOCKfile indicates startup is in progress.Testing
GIT_CONFIG_GLOBAL=/dev/null CARGO_NET_GIT_FETCH_WITH_CLI=true cargo test -p hab gateway_utilFixes #6301.