Skip to content

Commit 02dbfc0

Browse files
committed
server: use LogEngine for RegisterOfflineRecoveryEvents
The funcion accesses the Store-local keys used for LoQ recovery. Epic: none Release note: none
1 parent ec7a164 commit 02dbfc0

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

pkg/kv/kvserver/loqrecovery/record.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/cockroachdb/cockroach/pkg/keys"
1313
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverpb"
14+
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvstorage"
1415
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/loqrecovery/loqrecoverypb"
1516
"github.com/cockroachdb/cockroach/pkg/storage"
1617
"github.com/cockroachdb/cockroach/pkg/util/hlc"
@@ -64,7 +65,7 @@ func writeReplicaRecoveryStoreRecord(
6465
// recovery actions are properly reflected in server logs as needed.
6566
func RegisterOfflineRecoveryEvents(
6667
ctx context.Context,
67-
readWriter storage.ReadWriter,
68+
readWriter kvstorage.RaftRW,
6869
registerEvent func(context.Context, loqrecoverypb.ReplicaRecoveryRecord) (bool, error),
6970
) (int, error) {
7071
successCount := 0

pkg/kv/kvserver/loqrecovery/recovery_env_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,7 @@ func (e *quorumRecoveryEnv) dumpRecoveryEvents(
843843
if !ok {
844844
t.Fatalf("store s%d doesn't exist, but event dump is requested for it", store)
845845
}
846+
// TODO(sep-raft-log): store.engine should be the log engine.
846847
if _, err := RegisterOfflineRecoveryEvents(ctx, store.engine, logEvents); err != nil {
847848
return "", err
848849
}

pkg/server/loss_of_quorum.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func logPendingLossOfQuorumRecoveryEvents(ctx context.Context, stores *kvserver.
6262
// cluster-replicated destinations.
6363
eventCount, err := loqrecovery.RegisterOfflineRecoveryEvents(
6464
ctx,
65-
s.TODOEngine(),
65+
s.LogEngine(),
6666
func(ctx context.Context, record loqrecoverypb.ReplicaRecoveryRecord) (bool, error) {
6767
event := record.AsStructuredLog()
6868
log.StructuredEvent(ctx, severity.INFO, &event)
@@ -94,7 +94,7 @@ func maybeRunLossOfQuorumRecoveryCleanup(
9494
if err := stores.VisitStores(func(s *kvserver.Store) error {
9595
_, err := loqrecovery.RegisterOfflineRecoveryEvents(
9696
ctx,
97-
s.TODOEngine(),
97+
s.StateEngine(),
9898
func(ctx context.Context, record loqrecoverypb.ReplicaRecoveryRecord) (bool, error) {
9999
sqlExec := func(ctx context.Context, stmt string, args ...interface{}) (int, error) {
100100
return ie.ExecEx(ctx, "", nil,

0 commit comments

Comments
 (0)