Skip to content

server: fix a race condition during server initialization#101097

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20230410-storage-race
Apr 10, 2023
Merged

server: fix a race condition during server initialization#101097
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20230410-storage-race

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Apr 10, 2023 •
edited
Loading

Fixes #91414.
Fixes #101010.
Fixes #100902.

The call to registerEnginesForDiskStatsMap needs to wait until the store IDs are known.

Release note: None
Epic: None

@knz
server: fix a race condition during server initialization
2f4cd92 
The call to `registerEnginesForDiskStatsMap` needs to wait until the
store IDs are known.

Release note: None
@knz knz added the backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only label Apr 10, 2023
@knz knz requested review from jbowens and sumeerbhola April 10, 2023 15:29
@knz knz requested a review from a team as a code owner April 10, 2023 15:29
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Apr 10, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Copy Markdown
Member

cockroach-teamcity commented Apr 10, 2023

This change is Reviewable

@knz knz mentioned this pull request Apr 10, 2023
Closed
irfansharif
irfansharif approved these changes Apr 10, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@irfansharif irfansharif left a comment

Choose a reason for hiding this comment

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

Thanks! Sorry for letting this flake sit for so long.

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Apr 10, 2023

bors r=irfansharif

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 10, 2023

Build succeeded:

@craig craig bot merged commit a73b33f into cockroachdb:master Apr 10, 2023
@blathers-crl blathers-crl bot mentioned this pull request Apr 10, 2023
Merged
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Apr 10, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.

error creating merge commit from 2f4cd92 to blathers/backport-release-22.2-101097: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@knz knz deleted the 20230410-storage-race branch April 10, 2023 16:48
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Apr 10, 2023

@irfansharif can you take care of the manual backport for 22.2 thx

@irfansharif irfansharif mentioned this pull request Apr 10, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jbowens jbowens Awaiting requested review from jbowens

@sumeerbhola sumeerbhola Awaiting requested review from sumeerbhola

1 more reviewer

@irfansharif irfansharif irfansharif approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only

Projects

None yet

Milestone

No milestone

3 participants

@knz @cockroach-teamcity @irfansharif