gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Reset WAL on mismatch catchup regardless, condition ok

Browse Source 
Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2021-02-07 09:30:13 -08:00
parent a16affedca
commit 92d64c2bcc
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/raft.go
View File

@@ -1909,20 +1909,11 @@ func (n *raft) processAppendEntry(ae *appendEntry, sub *subscription) {
// could need to adjust our starting index since the leader does not have entries prior, or
// we missed some catchup messages.
if catchingUp {
if len(ae.entries) > 0 && ae.entries[0].Type != EntryNormal {
if len(ae.entries) > 0 {
n.debug("Should reset index for wal to %d", ae.pindex+1)
n.wal.Compact(ae.pindex + 1)
n.pindex = ae.pindex
n.commit = ae.pindex
} else {
fmt.Printf("[%s - %s] pterm is %d, pindex is %d, ae.pterm is %d, ae.pindex is %d\n", n.s, n.group, n.pterm, n.pindex, ae.pterm, ae.pindex)
fmt.Printf("[%s] numEntries is %d\n", n.s, len(ae.entries))
if len(ae.entries) > 0 {
fmt.Printf("[%s] entry is %q\n", n.s, ae.entries[0].Data)
}
fmt.Printf("[%s] is cacthup sub? %v\n", n.s, sub == n.catchup.sub)
fmt.Printf("[%s] cactchup is %+v\n", n.s, n.catchup)
panic("Catchup mismatch!")
}
} else {
n.debug("AppendEntry did not match %d %d with %d %d", ae.pterm, ae.pindex, n.pterm, n.pindex)