eclient,log_test,userdata: ssh robustness improvements#1143
Merged
eriknordmark merged 2 commits intolf-edge:masterfrom Apr 20, 2026
Merged
eclient,log_test,userdata: ssh robustness improvements#1143eriknordmark merged 2 commits intolf-edge:masterfrom
eriknordmark merged 2 commits intolf-edge:masterfrom
Conversation
eriknordmark
force-pushed
the
erik-networks
branch
from
94e39e8 to
9993208
Compare
…order Replace the iteration-bounded seq/sleep loop in ssh.sh with a time-bounded while loop (18 min, explicit exit 1 on expiry) to reliably fill the exec -t 20m budget. Restore TestInfo as a background process started before ssh.sh. Eden's InfoChecker uses InfoNew mode (new messages only), so TestInfo must be subscribed before the curl POST fires to capture the immediate ZInfoMsg EVE sends on AppInstMetadata receipt. Running TestInfo after ssh.sh meant the subscription was registered after that message had already arrived at Adam; the next info comes from the periodic timer (10m ± 20% jitter), well outside any reasonable timewait. Raise the TestInfo timewait to 20m to cover the full 18m ssh.sh window plus the periodic timer as a fallback. Signed-off-by: eriknordmark <erik@zededa.com> Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…sshd readiness check Replace iteration-bounded seq/sleep SSH retry loops in eclient.txt and userdata.txt with time-bounded while loops. The old loops ran for at most seq*sleep seconds and fell through silently; the new loops run until 30s before the exec -t deadline and exit 1 explicitly when no connection was made, making failures visible rather than letting the test continue with an ambiguous result. In log_test.txt, add a foreground wait_ssh.sh step (5m timeout) that polls `eden eve ssh` until EVE's sshd accepts a connection before the background ssh.sh starts generating log entries. log_test runs immediately after eve_restart in the smoke suite; the restart confirms EVE is up via Adam registration, but sshd takes additional time to become operational, causing all SSH attempts to fail with connection timeouts/resets and TestLog to time out waiting for "Disconnected" entries. Signed-off-by: eriknordmark <erik@zededa.com> Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
eriknordmark
force-pushed
the
erik-networks
branch
from
e813211 to
866067e
Compare
eriknordmark
changed the title
eriknordmark
changed the title
This was referenced May 7, 2026
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
2 participants
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.
metadata test: SSH retry robustness
Replace the iteration-bounded seq/sleep loop in ssh.sh with a
time-bounded while loop (18 min, explicit exit 1 on expiry) to reliably
fill the exec -t 20m budget.
eclient,log_test,userdata: ssh robustness improvements
Increase SSH timeouts, add failure indication and sshd readiness check
Replace iteration-bounded seq/sleep SSH retry loops in eclient.txt and
userdata.txt with time-bounded while loops, which exit 1 if it never
manages to connect.
In log_test.txt, add a foreground wait_ssh.sh step (5m timeout) that
polls
eden eve sshuntil EVE's sshd accepts a connection before thebackground ssh.sh starts generating log entries.