fix viewchange bug

tangledbytes · tangledbytes · commit 3d108c503f07 · 2023-11-10T16:37:01.000+05:30
Signed-off-by: Utkarsh Srivastava &lt;srivastavautkarsh8097@gmail.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-*.pprof
+*.pprof
+*.log
diff --git a/internal/simulator/simulator.go b/internal/simulator/simulator.go
@@ -161,9 +161,10 @@ func (r *Simulator) clusterSanityChecks() {
 		state := replica.VSRState()
 		assert.Assert(
 			state.OpNum >= state.CommitNumber,
-			"expected opNum to be <= commitNum, found opNum: %d, commitNum: %d",
+			"expected opNum to be <= commitNum, found opNum: %d, commitNum: %d (viewNum: %d)",
 			state.OpNum,
 			state.CommitNumber,
+			state.ViewNumber,
 		)
 	}
 }
diff --git a/pkg/replica/replica.go b/pkg/replica/replica.go
@@ -1039,6 +1039,7 @@ func (r *Replica) finalizeViewChange() {
 		}
 	}
 
+	r.state.OpNum = bestOpNum
 	r.state.Logs = bestLogs
 	r.state.CommitNumber = bestCommit
 	r.state.Status = ReplicaStatusNormal
diff --git a/records/regression_seeds b/records/regression_seeds
@@ -0,0 +1 @@
+1234

Original file line number	Diff line number	Diff line change
`@@ -161,9 +161,10 @@ func (r *Simulator) clusterSanityChecks() {`
`161`	`161`	`state := replica.VSRState()`
`162`	`162`	`assert.Assert(`
`163`	`163`	`state.OpNum >= state.CommitNumber,`
`164`		`- "expected opNum to be <= commitNum, found opNum: %d, commitNum: %d",`
	`164`	`+ "expected opNum to be <= commitNum, found opNum: %d, commitNum: %d (viewNum: %d)",`
`165`	`165`	`state.OpNum,`
`166`	`166`	`state.CommitNumber,`
	`167`	`+ state.ViewNumber,`
`167`	`168`	`)`
`168`	`169`	`}`
`169`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1039,6 +1039,7 @@ func (r *Replica) finalizeViewChange() {`
`1039`	`1039`	`}`
`1040`	`1040`	`}`
`1041`	`1041`
	`1042`	`+ r.state.OpNum = bestOpNum`
`1042`	`1043`	`r.state.Logs = bestLogs`
`1043`	`1044`	`r.state.CommitNumber = bestCommit`
`1044`	`1045`	`r.state.Status = ReplicaStatusNormal`