Merge pull request #3453 from rlan35/main

be more lenient on grace period
pull/3456/head v2.4.0
Rongjian Lan 4 years ago committed by GitHub
commit 037f6222de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      consensus/leader.go

@ -303,9 +303,15 @@ func (consensus *Consensus) onCommit(msg *msg_pb.Message) {
consensus.preCommitAndPropose(blockObj) consensus.preCommitAndPropose(blockObj)
} }
consensus.getLogger().Info().Msg("[OnCommit] Starting Grace Period")
go func(viewID uint64) { go func(viewID uint64) {
time.Sleep(1000 * time.Millisecond) waitTime := 1000 * time.Millisecond
maxWaitTime := time.Until(consensus.NextBlockDue) - 200*time.Millisecond
if maxWaitTime > waitTime {
waitTime = maxWaitTime
}
consensus.getLogger().Info().Str("waitTime", waitTime.String()).
Msg("[OnCommit] Starting Grace Period")
time.Sleep(waitTime)
logger.Info().Msg("[OnCommit] Commit Grace Period Ended") logger.Info().Msg("[OnCommit] Commit Grace Period Ended")
consensus.mutex.Lock() consensus.mutex.Lock()

Loading…
Cancel
Save