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

storage: include version in benchmark fixture directory #97134

Merged
merged 1 commit into from
Feb 15, 2023

Conversation

RaduBerinde
Copy link
Member

This benchmark is sometimes failing in CI and I cannot reproduce locally. The error is consistent with a leftover fixture from an older version (which shouldn't happen because CI should be cleaning up the repo).

This change adds the version to the fixture name so that this kind of cross-version problem cannot occur. This is a good idea regardless of the CI issue.

Informs #97061

Release note: None
Epic: none

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@RaduBerinde RaduBerinde marked this pull request as ready for review February 14, 2023 18:47
@RaduBerinde RaduBerinde requested a review from a team as a code owner February 14, 2023 18:47
@RaduBerinde RaduBerinde force-pushed the refresh-range-potential-fix branch from 5b5d1c3 to 03829c4 Compare February 14, 2023 18:54
@RaduBerinde RaduBerinde requested review from a team and bananabrick February 14, 2023 19:25
@RaduBerinde RaduBerinde force-pushed the refresh-range-potential-fix branch from 03829c4 to 1ea9b89 Compare February 14, 2023 19:31
Copy link
Collaborator

@jbowens jbowens left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @bananabrick and @RaduBerinde)


pkg/kv/kvserver/batcheval/cmd_refresh_range_bench_test.go line 225 at r1 (raw file):

		readOnlyStr = "_readonly"
	}
	loc := fmt.Sprintf("refresh_range_bench_data_%s_%s%s_%d_%d_%d",

nit: should there be another underscore delimiter too?

Copy link
Member Author

@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.

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @bananabrick and @jbowens)


pkg/kv/kvserver/batcheval/cmd_refresh_range_bench_test.go line 225 at r1 (raw file):

Previously, jbowens (Jackson Owens) wrote…

nit: should there be another underscore delimiter too?

the %s without a preceding delimitier is readOnlyStr which is either empty or _readonly. I just added a %s_ in front

@RaduBerinde
Copy link
Member Author

This was meant to be a moonshot but apparently it might be possible for these fixtures to survive between builds in the CI bazel sandbox. I will expand the PR to include other similar benchmarks.

Some storage-related benchmarks leave fixtures around in `.gitignore`d
directories.

There is potential for fixtures from old versions to cause failures.
We are seeing some CI failures that would be explained by this (we're
not sure yet if it's possible).

In any case, it is better to include the version in the fixture name
to avid this (which can be a problem even locally).

The logging around the fixture location is also improved.

Informs cockroachdb#97061

Release note: None
Epic: none
@RaduBerinde RaduBerinde force-pushed the refresh-range-potential-fix branch from 1ea9b89 to 204ad97 Compare February 14, 2023 21:09
@RaduBerinde RaduBerinde requested a review from a team February 14, 2023 21:09
@RaduBerinde RaduBerinde changed the title batcheval: include version in fixture directory storage: include version in benchmark fixture directory Feb 14, 2023
@RaduBerinde
Copy link
Member Author

Made a similar change to other benchmarks that do this.

@RaduBerinde RaduBerinde requested a review from jbowens February 14, 2023 22:04
Copy link
Collaborator

@jbowens jbowens left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 8 of 8 files at r2.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @bananabrick)

@RaduBerinde
Copy link
Member Author

bors r+

@RaduBerinde
Copy link
Member Author

TFTR!

@craig
Copy link
Contributor

craig bot commented Feb 15, 2023

Build succeeded:

@craig craig bot merged commit 3c4d3ef into cockroachdb:master Feb 15, 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
Development

Successfully merging this pull request may close these issues.

3 participants