-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]> Co-authored-by: Oleg Afanasyev <[email protected]>
- Loading branch information
Showing
17 changed files
with
342 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // Copyright 2022 The Cockroach Authors. | ||
| // | ||
| // Use of this software is governed by the Business Source License | ||
| // included in the file licenses/BSL.txt. | ||
| // | ||
| // As of the Change Date specified in that file, in accordance with | ||
| // the Business Source License, use of this software will be governed | ||
| // by the Apache License, Version 2.0, included in the file | ||
| // licenses/APL.txt. | ||
|
|
||
| package loqrecovery | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "testing" | ||
|
|
||
| "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverpb" | ||
| "github.com/cockroachdb/cockroach/pkg/kv/kvserver/loqrecovery/loqrecoverypb" | ||
| "github.com/cockroachdb/cockroach/pkg/roachpb" | ||
| "github.com/cockroachdb/cockroach/pkg/util/leaktest" | ||
| "github.com/cockroachdb/cockroach/pkg/util/timeutil" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // TestPublishRangeLogEvents verifies that inserting recovery events into | ||
| // RangeLog handles sql execution errors and unexpected results by propagating | ||
| // errors up. This is important as caller relies on errors to preserve events if | ||
| // they were not reflected in RangeLog. | ||
| // It also performs basic sanity check that inserted records have correct range | ||
| // id and reason for update and a timestamp. | ||
| func TestPublishRangeLogEvents(t *testing.T) { | ||
| defer leaktest.AfterTest(t)() | ||
| ctx := context.Background() | ||
|
|
||
| for _, td := range []struct { | ||
| name string | ||
|
|
||
| // Recovery event and function under test arguments. | ||
| rangeID roachpb.RangeID | ||
| time int64 | ||
|
|
||
| // Callback results returned to function under test. | ||
| returnedRowCount int | ||
| queryExecError error | ||
|
|
||
| // Expectations in callback and call results. | ||
| expectSuccess bool | ||
| }{ | ||
| { | ||
| name: "success", | ||
| rangeID: 7, | ||
| time: 1021, | ||
| returnedRowCount: 1, | ||
| expectSuccess: true, | ||
| }, | ||
| { | ||
| name: "sql error", | ||
| rangeID: 7, | ||
| time: 1021, | ||
| returnedRowCount: 1, | ||
| queryExecError: errors.New("stray sql error occurred"), | ||
| }, | ||
| { | ||
| name: "wrong row count", | ||
| rangeID: 7, | ||
| time: 1021, | ||
| returnedRowCount: 0, | ||
| expectSuccess: false, | ||
| }, | ||
| } { | ||
| t.Run(td.name, func(t *testing.T) { | ||
| var actualArgs []interface{} | ||
| execFn := func(ctx context.Context, stmt string, args ...interface{}) (int, error) { | ||
| actualArgs = args | ||
| return td.returnedRowCount, td.queryExecError | ||
| } | ||
|
|
||
| event := loqrecoverypb.ReplicaRecoveryRecord{ | ||
| Timestamp: td.time, | ||
| RangeID: td.rangeID, | ||
| StartKey: loqrecoverypb.RecoveryKey(roachpb.RKeyMin), | ||
| EndKey: loqrecoverypb.RecoveryKey(roachpb.RKeyMax), | ||
| } | ||
|
|
||
| err := UpdateRangeLogWithRecovery(ctx, execFn, event) | ||
| if td.expectSuccess { | ||
| require.NoError(t, err) | ||
| } else { | ||
| require.Error(t, err) | ||
| } | ||
| require.Equal(t, 6, len(actualArgs), "not enough query args were provided") | ||
| require.Contains(t, actualArgs[5], "Performed unsafe range loss of quorum recovery") | ||
| require.Equal(t, td.rangeID, actualArgs[1], "RangeID query arg doesn't match event") | ||
| require.Equal(t, timeutil.Unix(0, td.time), actualArgs[0], | ||
| "timestamp query arg doesn't match event") | ||
| require.Equal(t, kvserverpb.RangeLogEventType_unsafe_quorum_recovery.String(), actualArgs[3], | ||
| "incorrect RangeLog event type") | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.