kvserver: update truncator datadriven tests

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/raft_log_truncator_test.go

@@ -156,18 +156,15 @@ func (r *replicaTruncatorTest) getStateLoader() stateloader.StateLoader {
 }
 
 func (r *replicaTruncatorTest) stagePendingTruncation(_ context.Context, pt pendingTruncation) {
-	expectedFirstIndexWasAccurate := r.truncState.Index+1 == pt.expectedFirstIndex
-	r.truncState = pt.RaftTruncatedState
-	// TODO(pav-kv): this is printing the legacy func names. Fix.
+	trusted := pt.isDeltaTrusted && r.truncState.Index+1 == pt.expectedFirstIndex
 	fmt.Fprintf(r.buf,
-		"r%d.setTruncatedStateAndSideEffects(..., expectedFirstIndex:%d) => trusted:%t\n",
-		r.rangeID, pt.expectedFirstIndex, expectedFirstIndexWasAccurate)
-	deltaTrusted := pt.isDeltaTrusted && expectedFirstIndexWasAccurate
-	fmt.Fprintf(r.buf, "r%d.setTruncationDeltaAndTrusted(delta:%d, trusted:%t)\n",
-		r.rangeID, pt.logDeltaBytes, deltaTrusted)
+		"r%d.stagePendingTruncation(..., expFirstIndex:%d, delta:%v, trusted:%t) => trusted:%t\n",
+		r.rangeID, pt.expectedFirstIndex, pt.logDeltaBytes, pt.isDeltaTrusted, trusted)
+	r.truncState = pt.RaftTruncatedState
 }
 
 func (r *replicaTruncatorTest) finalizeTruncation(_ context.Context) {
+	fmt.Fprintf(r.buf, "r%d.finalizeTruncation\n", r.rangeID)
 }
 
 func (r *replicaTruncatorTest) writeRaftStateToEngine(

pkg/kv/kvserver/testdata/raft_log_truncator

@@ -91,8 +91,8 @@ acquireReplica(1)
 r1.getTruncatedState
 r1.getPendingTruncs
 r1.getStateLoader
-r1.setTruncatedStateAndSideEffects(..., expectedFirstIndex:16) => trusted:false
-r1.setTruncationDeltaAndTrusted(delta:-30, trusted:false)
+r1.stagePendingTruncation(..., expFirstIndex:16, delta:-30, trusted:true) => trusted:false
+r1.finalizeTruncation
 releaseReplica(1)
 acquireReplica(2)
 r2.getTruncatedState
@@ -167,8 +167,8 @@ acquireReplica(2)
 r2.getTruncatedState
 r2.getPendingTruncs
 r2.getStateLoader
-r2.setTruncatedStateAndSideEffects(..., expectedFirstIndex:21) => trusted:true
-r2.setTruncationDeltaAndTrusted(delta:-30, trusted:true)
+r2.stagePendingTruncation(..., expFirstIndex:21, delta:-30, trusted:true) => trusted:true
+r2.finalizeTruncation
 releaseReplica(2)
 truncator ranges:
 
@@ -205,8 +205,8 @@ acquireReplica(2)
 r2.getTruncatedState
 r2.getPendingTruncs
 r2.getStateLoader
-r2.setTruncatedStateAndSideEffects(..., expectedFirstIndex:21) => trusted:false
-r2.setTruncationDeltaAndTrusted(delta:-30, trusted:false)
+r2.stagePendingTruncation(..., expFirstIndex:21, delta:-30, trusted:true) => trusted:false
+r2.finalizeTruncation
 releaseReplica(2)
 truncator ranges:
 
@@ -269,8 +269,8 @@ acquireReplica(2)
 r2.getTruncatedState
 r2.getPendingTruncs
 r2.getStateLoader
-r2.setTruncatedStateAndSideEffects(..., expectedFirstIndex:25) => trusted:true
-r2.setTruncationDeltaAndTrusted(delta:-30, trusted:true)
+r2.stagePendingTruncation(..., expFirstIndex:25, delta:-30, trusted:true) => trusted:true
+r2.finalizeTruncation
 releaseReplica(2)
 truncator ranges: 2
 
@@ -316,10 +316,9 @@ acquireReplica(2)
 r2.getTruncatedState
 r2.getPendingTruncs
 r2.getStateLoader
-r2.setTruncatedStateAndSideEffects(..., expectedFirstIndex:27) => trusted:true
-r2.setTruncationDeltaAndTrusted(delta:-60, trusted:false)
-r2.setTruncatedStateAndSideEffects(..., expectedFirstIndex:30) => trusted:true
-r2.setTruncationDeltaAndTrusted(delta:-30, trusted:true)
+r2.stagePendingTruncation(..., expFirstIndex:27, delta:-60, trusted:false) => trusted:false
+r2.stagePendingTruncation(..., expFirstIndex:30, delta:-30, trusted:true) => trusted:true
+r2.finalizeTruncation
 releaseReplica(2)
 truncator ranges:
 
@@ -382,10 +381,9 @@ acquireReplica(2)
 r2.getTruncatedState
 r2.getPendingTruncs
 r2.getStateLoader
-r2.setTruncatedStateAndSideEffects(..., expectedFirstIndex:32) => trusted:true
-r2.setTruncationDeltaAndTrusted(delta:-30, trusted:true)
-r2.setTruncatedStateAndSideEffects(..., expectedFirstIndex:33) => trusted:true
-r2.setTruncationDeltaAndTrusted(delta:-50, trusted:false)
+r2.stagePendingTruncation(..., expFirstIndex:32, delta:-30, trusted:true) => trusted:true
+r2.stagePendingTruncation(..., expFirstIndex:33, delta:-50, trusted:false) => trusted:false
+r2.finalizeTruncation
 releaseReplica(2)
 truncator ranges:
 
@@ -472,8 +470,8 @@ acquireReplica(3)
 r3.getTruncatedState
 r3.getPendingTruncs
 r3.getStateLoader
-r3.setTruncatedStateAndSideEffects(..., expectedFirstIndex:21) => trusted:true
-r3.setTruncationDeltaAndTrusted(delta:-30, trusted:true)
+r3.stagePendingTruncation(..., expFirstIndex:21, delta:-30, trusted:true) => trusted:true
+r3.finalizeTruncation
 releaseReplica(3)
 truncator ranges: 3