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

Merge pull request #3596 from nats-io/js_process_snap

Browse Source 
[FIXED] JetStream: processing of snapshot with expired messages
This commit is contained in:
Ivan Kozlovic
2022-11-01 13:27:29 -06:00
committed by GitHub
parent 56bd22f536 55e651c118
commit 32041d98d7
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/jetstream_cluster.go
View File

@@ -6683,7 +6683,7 @@ func (mset *stream) processSnapshotDeletes(snap *streamSnapshot) {
// Always adjust if FirstSeq has moved beyond our state.
if snap.FirstSeq > state.FirstSeq {
mset.store.Compact(snap.FirstSeq)
state = mset.store.State()
mset.store.FastState(&state)
mset.setLastSeq(state.LastSeq)
}
// Range the deleted and delete if applicable.
@@ -6811,12 +6811,6 @@ func (mset *stream) processSnapshot(snap *streamSnapshot) (e error) {
return nil
}
// See if our state's first sequence is >= the leader's snapshot.
// This signifies messages have been expired, purged, deleted and the leader no longer has them.
if snap.FirstSeq < state.FirstSeq {
sreq.FirstSeq = state.FirstSeq + 1
}
// Pause the apply channel for our raft group while we catch up.
if err := n.PauseApply(); err != nil {
return err
@@ -6941,11 +6935,6 @@ RETRY:
if sreq == nil {
return nil
}
// See if our state's first sequence is >= the leader's snapshot.
// This signifies messages have been expired, purged, deleted and the leader no longer has them.
if snap.FirstSeq < state.FirstSeq {
sreq.FirstSeq = state.FirstSeq + 1
}
// Reset notion of lastRequested
lastRequested = sreq.LastSeq
}