Merge #72310

72310: kvserver: remove unused snapshot log entry code r=erikgrinaker a=tbg We used to have to send the raft log along with snapshots as a result of (in the olden days) requiring all replicas to agree on the truncated state. This hasn't been (generally) true as of v19.1 (#35701), though it was still a possibility until v22.1 (#58088). This commit removes the corresponding code. Release note: None Co-authored-by: Tobias Grieger <[email protected]>
cockroachdb · Nov 2, 2021 · e69a074 · e69a074
2 parents a8d8676 + c9882b5
commit e69a074
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 555 deletions.
diff --git a/pkg/kv/kvserver/raft.pb.go b/pkg/kv/kvserver/raft.pb.go
diff --git a/pkg/kv/kvserver/raft.proto b/pkg/kv/kvserver/raft.proto
@@ -195,12 +195,9 @@ message SnapshotRequest {
   // A RocksDB BatchRepr. Multiple kv_batches may be sent across multiple request messages.
   bytes kv_batch = 2 [(gogoproto.customname) = "KVBatch"];
 
-  // These are really raftpb.Entry, but we model them as raw bytes to avoid
-  // roundtripping through memory. They are separate from the kv_batch to
-  // allow flexibility in log implementations.
-  repeated bytes log_entries = 3;
-
   bool final = 4;
+
+  reserved 3;
 }
 
 message SnapshotResponse {