kv: include lease epoch in RangeInfo.CTEntry

Should help with debugging.
cockroachdb · May 19, 2020 · 3c0de0f · 3c0de0f
1 parent 94e3e2f
commit 3c0de0f
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 68 deletions.
diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go
@@ -1025,8 +1025,9 @@ func (r *Replica) State() storagepb.RangeInfo {
 				}
 				if ri.NewestClosedTimestamp.ClosedTimestamp.Less(e.ClosedTimestamp) {
 					ri.NewestClosedTimestamp.NodeID = replDesc.NodeID
-					ri.NewestClosedTimestamp.MLAI = int64(mlai)
 					ri.NewestClosedTimestamp.ClosedTimestamp = e.ClosedTimestamp
+					ri.NewestClosedTimestamp.MLAI = int64(mlai)
+					ri.NewestClosedTimestamp.Epoch = int64(e.Epoch)
 				}
 				return true // done
 			})

diff --git a/pkg/kv/kvserver/storagepb/state.pb.go b/pkg/kv/kvserver/storagepb/state.pb.go
diff --git a/pkg/kv/kvserver/storagepb/state.proto b/pkg/kv/kvserver/storagepb/state.proto
@@ -103,6 +103,7 @@ message RangeInfo {
       (gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.NodeID"];
     util.hlc.Timestamp closed_timestamp = 2 [(gogoproto.nullable) = false];
     int64 mlai = 3 [(gogoproto.customname) = "MLAI"];
+    int64 epoch = 4;
   }
   // The highest closed timestamp known to have data for this replica, taken
   // across the data received from all nodes. This does not reflect whether