Skip to content

release-25.3: roachtest: simplify and deflake cleanup in clock jump test #156528

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
tbg merged 1 commit into from
Oct 30, 2025
Merged

release-25.3: roachtest: simplify and deflake cleanup in clock jump test #156528

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 8 additions & 11 deletions pkg/cmd/roachtest/tests/clock_jump_crash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,7 @@ func runClockJump(ctx context.Context, t test.Test, c cluster.Cluster, tc clockJ
// test is done to pacify the dead node detector. Do this after the
// clock offset is reset or the node will crash again.
var aliveAfterOffset bool
defer func() {
offsetInjector.recover(ctx, c.Spec().NodeCount)
// Resetting the clock is a jump in the opposite direction which
// can cause a crash even if the original jump didn't. Wait a few
// seconds before checking whether the node is alive and
// restarting it if not.
time.Sleep(3 * time.Second)
if !isAlive(db, t.L()) {
c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings(), c.Node(1))
}
}()

defer offsetInjector.recover(ctx, c.Spec().NodeCount)
offsetInjector.offset(ctx, c.Spec().NodeCount, tc.offset)

Expand All @@ -76,6 +66,13 @@ func runClockJump(ctx context.Context, t test.Test, c cluster.Cluster, tc clockJ
if aliveAfterOffset != tc.aliveAfterOffset {
t.Fatalf("Expected node health %v, got %v", tc.aliveAfterOffset, aliveAfterOffset)
}

// Resetting the clock is a jump in the opposite direction which can cause a
// crash even if the original jump didn't. Since we do not control when
// exactly the clock jumps, we simply stop and wipe the node (which also
// prevents the post-test assertions from complaining about a down node).
c.Wipe(ctx, c.All())
offsetInjector.recover(ctx, c.Spec().NodeCount)
}

type clockJumpTestCase struct {
Expand Down