Skip to content

cli,rpc: don't check the active cluster version in the CLI#75237

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20220120-rpc-client
Jan 21, 2022
Merged

cli,rpc: don't check the active cluster version in the CLI#75237
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20220120-rpc-client

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Jan 20, 2022

This commit removes a code path that would tickle an assertion failure
if we were to later fix the context propagation in the RPC heartbeat
method (see PR #71243): there's no "active cluster version" in the CLI
and so we can't compare it in a client interceptor.

Release note: None

@knz knz requested a review from andreimatei January 20, 2022 19:13
@knz knz requested a review from a team as a code owner January 20, 2022 19:13
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@andreimatei andreimatei left a comment

Choose a reason for hiding this comment

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

:LGTM:

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


pkg/rpc/context.go, line 925 at r1 (raw file):

		if rpcCtx.ClientOnly {
			// client-only RPC contexts don't have a node ID to report nor a
			// cluster version to check against the remote node.

nit: the version checking is not particularly tied to the "remote node". I'd scratch that part.

@knz knz force-pushed the 20220120-rpc-client branch from 5bf9c0b to f3dc87d Compare January 20, 2022 19:22
Copy link
Copy Markdown
Contributor Author

@knz knz left a comment

Choose a reason for hiding this comment

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

TFYR!

bors r=andreimatei

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


pkg/rpc/context.go, line 925 at r1 (raw file):

Previously, andreimatei (Andrei Matei) wrote…

nit: the version checking is not particularly tied to the "remote node". I'd scratch that part.

Thanks, removed.

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 20, 2022

bors r-

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 20, 2022

Canceled.

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 20, 2022

let's wait for CI to pass before merging this

This commit removes a code path that would tickle an assertion failure
if we were to later fix the context propagation in the RPC heartbeat
method (see PR cockroachdb#71243): there's no "active cluster version" in the CLI
and so we can't compare it in a client interceptor.

Release note: None
@knz knz force-pushed the 20220120-rpc-client branch from f3dc87d to ad6289a Compare January 20, 2022 20:29
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 20, 2022

bors r=andreimatei

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 21, 2022

Build succeeded:

@craig craig bot merged commit 488a06b into cockroachdb:master Jan 21, 2022
@knz knz deleted the 20220120-rpc-client branch January 21, 2022 17:05
craig bot pushed a commit that referenced this pull request Jan 21, 2022
71243: rpc: add logging tags for rpc connect events r=andreimatei a=knz

Epic: CRDB-11517
First commit from #75237.

This ensures that the log messages sent to the DEV channel relating to
RPC low-level activity (e.g. conn failures, heartbeat etc) include the
remote node ID and address and connection class.

This also connects the heartbeat task to the tracing infra properly.

Example before:
```
[n6] 87  dialing n4: 127.0.0.1:41706 (default)
```

After:
```
[n6,rnode=4,raddr=127.0.0.1:41706,class=default] 87  dialing
```


74333: kvserver/loqrecovery: write replica recovery events to rangelog r=tbg,erikgrinaker a=aliher1911

Previously a fact of loss of quorum replica recovery was only written
as a structured log entry. This information is local to the node and
does not survive if node is decommissioned. It would be beneficial
to preserve this information longer. Range log while being limited
to 30 days still provide a good reference data for investigations if
recovery wasn't performed too long ago.
This patch adds entries to rangelog for every updated range first time
node that holds survivor replica is started after recovery.

Release note: None

Addresses #73679

Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
Co-authored-by: Oleg Afanasyev <oleg@cockroachlabs.com>
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