Skip to content
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.

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

roachtest: fix disk-stalled/* roachtests #103680

Merged
merged 1 commit into from
May 19, 2023
Merged

Conversation

jbowens
Copy link
Collaborator

@jbowens jbowens commented May 19, 2023

In #103198, I mistakenly constructed a context with a timeout outside the deferral, resulting in the defer'd Unstall always timing out if the remainder of test took longer than a minute.

Epic: None
Fixes: #103664.
Fixes: #103663.
Fixes: #103662.
Fixes: #103661.
Release note: none

In cockroachdb#103198, I mistakenly constructed a context with a timeout outside the
deferral, resulting in the defer'd Unstall always timing out if the remainder
of test took longer than a minute.

Epic: None
Fixes: cockroachdb#103664.
Fixes: cockroachdb#103663.
Fixes: cockroachdb#103662.
Fixes: cockroachdb#103661.
Release note: none
@jbowens jbowens requested a review from a team May 19, 2023 18:29
@jbowens jbowens requested a review from a team as a code owner May 19, 2023 18:29
@jbowens jbowens requested review from itsbilal, srosenberg and smg260 and removed request for a team May 19, 2023 18:29
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@RaduBerinde RaduBerinde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @itsbilal, @jbowens, @smg260, and @srosenberg)


pkg/cmd/roachtest/tests/disk_stall.go line 167 at r1 (raw file):

	// the disk stalled will prevent artifact collection, making debugging
	// difficult.
	defer func() {

Heh, I had wanted to ask about this but I mistakenly assumed the entire test is not expected to exceed 1minute.

@jbowens
Copy link
Collaborator Author

jbowens commented May 19, 2023

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented May 19, 2023

Build succeeded:

@craig craig bot merged commit a269433 into cockroachdb:master May 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants