Merge pull request #476 from yacovm/restartTimersUponLeaderChange

Restart request pool timers when leader rotates

Author: C0rWin

internal/bft/controller.go

@@ -508,6 +508,8 @@ func (c *Controller) decide(d decision) {
 	if c.checkIfRotate(md.BlackList) {
 		c.Logger.Debugf("Restarting view to rotate the leader")
 		c.changeView(c.getCurrentViewNumber(), md.LatestSequence+1, c.getCurrentDecisionsInView())
+		c.Logger.Debugf("Restarting timers in request pool due to leader rotation")
+		c.RequestPool.RestartTimers()
 	}
 	c.MaybePruneRevokedRequests()
 	if iAm, _ := c.iAmTheLeader(); iAm {

internal/bft/controller_test.go

@@ -834,7 +834,12 @@ func TestRotateFromLeaderToFollower(t *testing.T) {
 	assert.NoError(t, err)
 	defer wal.Close()
 
+	var restartTimersWG sync.WaitGroup
+	restartTimersWG.Add(2)
 	reqPool := &mocks.RequestPool{}
+	reqPool.On("RestartTimers").Run(func(args mock.Arguments) {
+		restartTimersWG.Done()
+	})
 	reqPool.On("Prune", mock.Anything)
 	reqPool.On("Close")
 	leaderMon := &mocks.LeaderMonitor{}
@@ -969,6 +974,7 @@ func TestRotateFromLeaderToFollower(t *testing.T) {
 	controller.ProcessMessages(1, commit1Next)
 	controller.ProcessMessages(3, commit3Next)
 	leaderMonWG.Wait()
+	restartTimersWG.Wait()
 	appWG.Wait()
 	app.AssertNumberOfCalls(t, "Deliver", 2)
 
@@ -987,9 +993,14 @@ func TestRotateFromFollowerToLeader(t *testing.T) {
 	assert.NoError(t, err)
 	defer wal.Close()
 
+	var restartTimersWG sync.WaitGroup
+	restartTimersWG.Add(2)
 	reqPool := &mocks.RequestPool{}
 	reqPool.On("Prune", mock.Anything)
 	reqPool.On("Close")
+	reqPool.On("RestartTimers").Run(func(args mock.Arguments) {
+		restartTimersWG.Done()
+	})
 	leaderMon := &mocks.LeaderMonitor{}
 	leaderMonWG := sync.WaitGroup{}
 	leaderMon.On("ChangeRole", bft.Leader, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
@@ -1132,6 +1143,7 @@ func TestRotateFromFollowerToLeader(t *testing.T) {
 	controller.ProcessMessages(1, commit1Next)
 	controller.ProcessMessages(2, commit2Next)
 	followerMonWG.Wait()
+	restartTimersWG.Wait()
 	appWG.Wait()
 	app.AssertNumberOfCalls(t, "Deliver", 2)