kvstorage: annotate RewriteRaftState with RaftWO

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/kvstorage/destroy.go

@@ -247,25 +247,25 @@ func RemoveStaleRHSFromSplit(
 // TODO(pav-kv): get rid of the returned cleared spans.
 func RewriteRaftState(
 	ctx context.Context,
-	w storage.Writer,
+	raftWO RaftWO,
 	sl StateLoader,
 	hs raftpb.HardState,
 	ts kvserverpb.RaftTruncatedState,
 ) (cleared roachpb.Span, _ error) {
 	// Update HardState.
-	if err := sl.SetHardState(ctx, w, hs); err != nil {
+	if err := sl.SetHardState(ctx, raftWO, hs); err != nil {
 		return roachpb.Span{}, errors.Wrapf(err, "unable to write HardState")
 	}
 	// Clear the raft log. Note that there are no Pebble range keys in this span.
 	logPrefix := sl.RaftLogPrefix().Clone()
 	raftLog := roachpb.Span{Key: logPrefix, EndKey: logPrefix.PrefixEnd()}
-	if err := w.ClearRawRange(
+	if err := raftWO.ClearRawRange(
 		raftLog.Key, raftLog.EndKey, true /* pointKeys */, false, /* rangeKeys */
 	); err != nil {
 		return roachpb.Span{}, errors.Wrapf(err, "unable to clear the raft log")
 	}
 	// Update the log truncation state.
-	if err := sl.SetRaftTruncatedState(ctx, w, &ts); err != nil {
+	if err := sl.SetRaftTruncatedState(ctx, raftWO, &ts); err != nil {
 		return roachpb.Span{}, errors.Wrapf(err, "unable to write RaftTruncatedState")
 	}
 	return raftLog, nil

pkg/kv/kvserver/snapshot_apply_prepare.go

@@ -19,6 +19,8 @@ import (
 
 // snapWriteBuilder contains the data needed to prepare the on-disk state for a
 // snapshot.
+//
+// TODO(pav-kv): move this struct to kvstorage package.
 type snapWriteBuilder struct {
 	id roachpb.FullReplicaID
 
@@ -61,7 +63,8 @@ func (s *snapWriteBuilder) prepareSnapApply(ctx context.Context) error {
 // provided state. Specifically, it rewrites HardState and RaftTruncatedState,
 // and clears the raft log. All writes are generated in the engine keys order.
 func (s *snapWriteBuilder) rewriteRaftState(ctx context.Context, w storage.Writer) error {
-	cleared, err := kvstorage.RewriteRaftState(ctx, w, s.sl, s.hardState, s.truncState)
+	cleared, err := kvstorage.RewriteRaftState(
+		ctx, kvstorage.RaftWO(w), s.sl, s.hardState, s.truncState)
 	if err != nil {
 		return err
 	}