kvserver: avoid duplicate loading in Store.Start

Release note: none
Epic: none

pkg/kv/kvserver/kvstorage/init.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/logstore"
+	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
@@ -312,6 +313,23 @@ func (r Replica) ID() storage.FullReplicaID {
 	}
 }
 
+// Load loads the state necessary to instantiate a replica in memory.
+func (r Replica) Load(ctx context.Context, eng storage.Reader) (LoadedReplicaState, error) {
+	ls := LoadedReplicaState{
+		ReplicaID: r.ReplicaID,
+		hardState: r.hardState,
+	}
+	sl := stateloader.Make(r.Desc.RangeID)
+	var err error
+	if ls.LastIndex, err = sl.LoadLastIndex(ctx, eng); err != nil {
+		return LoadedReplicaState{}, err
+	}
+	if ls.ReplState, err = sl.Load(ctx, eng, r.Desc); err != nil {
+		return LoadedReplicaState{}, err
+	}
+	return ls, nil
+}
+
 // A replicaMap organizes a set of Replicas with unique RangeIDs.
 type replicaMap map[roachpb.RangeID]Replica
 

pkg/kv/kvserver/replica_init.go

@@ -54,12 +54,17 @@ func loadInitializedReplica(
 	if err != nil {
 		return nil, err
 	}
-	r := newUninitializedReplica(store, desc.RangeID, replicaID)
+	return newInitializedReplica(store, state)
+}
+
+// newInitializedReplica creates an initialized Replica from its loaded state.
+func newInitializedReplica(store *Store, loaded kvstorage.LoadedReplicaState) (*Replica, error) {
+	r := newUninitializedReplica(store, loaded.ReplState.Desc.RangeID, loaded.ReplicaID)
 	r.raftMu.Lock()
 	defer r.raftMu.Unlock()
 	r.mu.Lock()
 	defer r.mu.Unlock()
-	if err := r.initRaftMuLockedReplicaMuLocked(state); err != nil {
+	if err := r.initRaftMuLockedReplicaMuLocked(loaded); err != nil {
 		return nil, err
 	}
 	return r, nil

pkg/kv/kvserver/store.go

@@ -1861,10 +1861,12 @@ func (s *Store) Start(ctx context.Context, stopper *stop.Stopper) error {
 			// Uninitialized Replicas are not currently instantiated at store start.
 			continue
 		}
-		// TODO(sep-raft-log): construct the loaded Replica state directly in
-		// LoadAndReconcileReplicas, which loads and checks most of it already, then
-		// feed it to Replica creation, to avoid double-loading.
-		rep, err := loadInitializedReplica(ctx, s, repl.Desc, repl.ReplicaID)
+		// TODO(pavelkalinnikov): integrate into kvstorage.LoadAndReconcileReplicas.
+		state, err := repl.Load(ctx, s.Engine())
+		if err != nil {
+			return err
+		}
+		rep, err := newInitializedReplica(s, state)
 		if err != nil {
 			return err
 		}