Skip to content

release-23.1: rpc: Fix blackhole recv#100238

Merged
andrewbaptist merged 1 commit intorelease-23.1from
blathers/backport-release-23.1-99840
Apr 4, 2023
Merged

release-23.1: rpc: Fix blackhole recv#100238
andrewbaptist merged 1 commit intorelease-23.1from
blathers/backport-release-23.1-99840

Conversation

@blathers-crl
Copy link
Copy Markdown

@blathers-crl blathers-crl bot commented Mar 30, 2023 •
edited by andrewbaptist
Loading

Backport 1/1 commits from #99840 on behalf of @andrewbaptist.

/cc @cockroachdb/release

Fixes: #99104
Informs #84289

As part of the previous fix for partition handling, we tracked the state of a previous attempt and use that result on the next attempt. However if there were multiple connections, we may only block system traffic connections and not default class connections. This change addresses that by ensuring a failed dialback attempt is remembered until we are able to successfully connect back to the pinging node.

Epic: none
Release note: None

Release justification: This correctly fixes the asymmetric partition case and is required to complete that work.

@blathers-crl blathers-crl bot requested a review from a team as a code owner March 30, 2023 23:39
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99840 branch from 108b484 to e0fbfa7 Compare March 30, 2023 23:39
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99840 branch from c524f2e to c402a7a Compare March 30, 2023 23:39
@blathers-crl
Copy link
Copy Markdown
Author

blathers-crl bot commented Mar 30, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 30, 2023
@blathers-crl
Copy link
Copy Markdown
Author

blathers-crl bot commented Mar 30, 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 Mar 30, 2023

This change is Reviewable

@ajwerner
Copy link
Copy Markdown
Contributor

ajwerner commented Mar 31, 2023

Don't merge this without fixing #100275

rpc: Fix blackhole recv
9c97ee0 
Fixes: #99104
Informs #84289

As part of the previous fix for partition handling, we tracked the state
of a previous attempt and use that result on the next attempt. However
if there were multiple connections, we may only block system traffic
connections and not default class connections.  This change addresses
that by ensuring a failed dialback attempt is remembered until we are
able to successfully connect back to the pinging node.

Epic: none
Release note: None
@andrewbaptist andrewbaptist force-pushed the blathers/backport-release-23.1-99840 branch from c402a7a to 9c97ee0 Compare March 31, 2023 13:23
@andrewbaptist
Copy link
Copy Markdown

andrewbaptist commented Mar 31, 2023

I updated it to include the changes from #100275 so it will be a single commit. I'm going to let this sit until Monday just to make sure nothing else comes out.

@erikgrinaker erikgrinaker mentioned this pull request Apr 2, 2023
Merged
@andrewbaptist andrewbaptist merged commit 185b893 into release-23.1 Apr 4, 2023
@andrewbaptist andrewbaptist deleted the blathers/backport-release-23.1-99840 branch April 4, 2023 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrewbaptist andrewbaptist Awaiting requested review from andrewbaptist

@smg260 smg260 Awaiting requested review from smg260

@srosenberg srosenberg Awaiting requested review from srosenberg

1 more reviewer

@erikgrinaker erikgrinaker erikgrinaker approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@andrewbaptist andrewbaptist

Labels

blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@cockroach-teamcity @ajwerner @andrewbaptist @erikgrinaker