Skip to content

rpc: avoid possible deadlock on Quiesce#104945

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
tbg:rpc-quiesce-fix
Jun 16, 2023
Merged

rpc: avoid possible deadlock on Quiesce#104945
craig[bot] merged 1 commit intocockroachdb:masterfrom
tbg:rpc-quiesce-fix

Conversation

@tbg
Copy link
Copy Markdown
Member

@tbg tbg commented Jun 15, 2023

If a probe exited due to quiescing, previously it would not signal
c.connFuture. But if a caller was sitting on c.ConnectNoBreaker, it would
never get signaled as a result, which could lead to deadlocks during quiesce (as observed in CI).

The future is now always signaled with an error if the probe refuses to start or
exits due to the stopper quiescing.

No release note since bug in no release.

Epic: None

If a probe exited due to quiescing, previously it would not signal
`c.connFuture`. But if a caller was sitting on `c.ConnectNoBreaker`, it would
never get signaled as a result, which could lead to deadlocks during quiesce (as observed in CI).

The future is now always signaled with an error if the probe refuses to start or
exits due to the stopper quiescing.

No release note since bug in no release.
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Jun 15, 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

This change is Reviewable

@tbg tbg requested a review from aliher1911 June 15, 2023 10:19
@tbg tbg marked this pull request as ready for review June 15, 2023 10:19
@tbg tbg requested a review from a team as a code owner June 15, 2023 10:19
Copy link
Copy Markdown
Contributor

@aliher1911 aliher1911 left a comment

Choose a reason for hiding this comment

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

💯

@aliher1911
Copy link
Copy Markdown
Contributor

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 15, 2023

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 15, 2023

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 15, 2023

Build failed:

@tbg
Copy link
Copy Markdown
Member Author

tbg commented Jun 16, 2023

Commit not found, etc, something broke in bors, not a test failure.

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 16, 2023

Build failed:

@tbg
Copy link
Copy Markdown
Member Author

tbg commented Jun 16, 2023

bors r+

#104864 (comment)

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 16, 2023

Build succeeded:

@craig craig bot merged commit 4eef4d8 into cockroachdb:master Jun 16, 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