Skip to content

kv: deflake and unskip TestStoreResolveMetrics#101936

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/fix98404
Apr 20, 2023
Merged

kv: deflake and unskip TestStoreResolveMetrics#101936
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/fix98404

Conversation

@nvb
Copy link
Copy Markdown
Contributor

@nvb nvb commented Apr 20, 2023

Fixes #98404.

The test had begun flaking after #98044 because we now perform more async intent resolution operations when starting a cluster. Specifically, we perform additional async intent resolution operations in service of jobs updates. These updates perform SELECT FOR UPDATE queries over the new system.job_info table, but then perform a 1-phase commit.

To deflake the test, we clear the intent resolution metrics after server startup.

Release note: None

Fixes cockroachdb#98404.

The test had begun flaking after cockroachdb#98044 because we now perform more async
intent resolution operations when starting a cluster. Specifically, we
perform additional async intent resolution operations in service of jobs
updates. These updates perform SELECT FOR UPDATE queries over the new
`system.job_info` table, but then perform a 1-phase commit.

To deflake the test, we clear the intent resolution metrics after server
startup.

Release note: None
@nvb nvb requested a review from arulajmani April 20, 2023 18:14
@nvb nvb requested a review from a team as a code owner April 20, 2023 18:14
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Collaborator

@arulajmani arulajmani left a comment

Choose a reason for hiding this comment

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

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

@nvb
Copy link
Copy Markdown
Contributor Author

nvb commented Apr 20, 2023

bors r=arulajmani

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 20, 2023

Build succeeded:

@craig craig bot merged commit ccc9d02 into cockroachdb:master Apr 20, 2023
@nvb nvb deleted the nvanbenschoten/fix98404 branch April 20, 2023 20:45
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.

kvserver: TestStoreResolveMetrics is very flaky

3 participants