Skip to content

fix: startup races #3172

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

Closed
alpe wants to merge 8 commits into from
Closed

fix: startup races #3172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
522863f
Fix startup races
alpe Mar 17, 2026
24cb707
Review feedback
alpe Mar 17, 2026
21ef2da
Store logs on e2e test failure
alpe Mar 18, 2026
9e3e8e5
Fix test
alpe Mar 18, 2026
505bce1
Merge branch 'main' into alex/fix_startup
alpe Mar 18, 2026
ab0f35a
Merge branch 'main' into alex/fix_startup
alpe Mar 18, 2026
4736118
Sync store; minor test updates
alpe Mar 18, 2026
fd9a2f9
Merge branch 'main' into alex/fix_startup
alpe Mar 19, 2026
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
Prev Previous commit
Next Next commit
Fix test
  • Loading branch information
@alpe
alpe committed Mar 18, 2026
commit 9e3e8e56d3fc2b454feef4150f0a76c5c38dd5fd
4 changes: 2 additions & 2 deletions test/e2e/failover_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,10 +989,10 @@ func must[T any](r T, err error) T {
func IsNodeUp(t *testing.T, rpcAddr string, timeout time.Duration) bool {
t.Helper()
t.Logf("Query node is up: %s", rpcAddr)
ctx, done := context.WithTimeout(context.Background(), timeout)
ctx, done := context.WithTimeout(t.Context(), timeout)
defer done()

ticker := time.NewTimer(min(timeout/10, 200*time.Millisecond))
ticker := time.NewTicker(min(timeout/10, 200*time.Millisecond))
defer ticker.Stop()
c := client.NewClient(rpcAddr)
require.NotNil(t, c)
Expand Down
8 changes: 6 additions & 2 deletions test/e2e/sut_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,12 @@ func (s *SystemUnderTest) awaitProcessCleanup(cmd *exec.Cmd) {
s.cmdToPids[cmdKey] = append(s.cmdToPids[cmdKey], pid)
s.pidsLock.Unlock()
go func() {
_ = cmd.Wait() // blocks until shutdown
s.logf("Process stopped, pid: %d\n", pid)
waitErr := cmd.Wait() // blocks until shutdown
if waitErr != nil {
s.logf("Process stopped, pid: %d, err: %v\n", pid, waitErr)
} else {
s.logf("Process stopped, pid: %d\n", pid)
}
s.pidsLock.Lock()
defer s.pidsLock.Unlock()
delete(s.pids, pid)
Expand Down
Loading