Skip to content

[FIXED] Reset clustered state on msg delete EOF #7348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neilalexander merged 1 commit into from
Sep 24, 2025
Merged

[FIXED] Reset clustered state on msg delete EOF #7348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions server/jetstream_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3408,7 +3408,7 @@ func (js *jetStream) applyStreamEntries(mset *stream, ce *CommittedEntry, isReco
}
panic(err.Error())
}
s, cc := js.server(), js.cluster
s := js.server()

var removed bool
if md.NoErase {
Expand All @@ -3417,20 +3417,25 @@ func (js *jetStream) applyStreamEntries(mset *stream, ce *CommittedEntry, isReco
removed, err = mset.eraseMsg(md.Seq)
}

// Cluster reset error.
var isLeader bool
if node := mset.raftNode(); node != nil && node.Leader() {
isLeader = true
}

if err == ErrStoreEOF {
return 0, err
if isLeader && !isRecovering {
var resp = JSApiMsgDeleteResponse{ApiResponse: ApiResponse{Type: JSApiMsgDeleteResponseType}}
resp.Error = NewJSStreamMsgDeleteFailedError(err, Unless(err))
s.sendAPIErrResponse(md.Client, mset.account(), md.Subject, md.Reply, _EMPTY_, s.jsonResponse(resp))
}
continue
}

if err != nil && !isRecovering {
s.Debugf("JetStream cluster failed to delete stream msg %d from '%s > %s': %v",
md.Seq, md.Client.serviceAccount(), md.Stream, err)
}

js.mu.RLock()
isLeader := cc.isStreamLeader(md.Client.serviceAccount(), md.Stream)
js.mu.RUnlock()

if isLeader && !isRecovering {
var resp = JSApiMsgDeleteResponse{ApiResponse: ApiResponse{Type: JSApiMsgDeleteResponseType}}
if err != nil {
Expand Down
27 changes: 27 additions & 0 deletions server/jetstream_cluster_1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10194,6 +10194,33 @@ func TestJetStreamClusterPersistModeAsync(t *testing.T) {
require_Error(t, err, NewJSStreamInvalidConfigError(fmt.Errorf("async persist mode is not supported on replicated streams")))
}

func TestJetStreamClusterDeleteMsgEOF(t *testing.T) {
for _, replicas := range []int{1, 3} {
t.Run(fmt.Sprintf("R%d", replicas), func(t *testing.T) {
c := createJetStreamClusterExplicit(t, "R3S", 3)
defer c.shutdown()

nc, js := jsClientConnect(t, c.randomServer())
defer nc.Close()

_, err := js.AddStream(&nats.StreamConfig{
Name: "TEST",
Subjects: []string{"foo"},
Replicas: replicas,
})
require_NoError(t, err)

_, err = js.Publish("foo", nil)
require_NoError(t, err)

require_Error(t, js.DeleteMsg("TEST", 0), NewJSNoMessageFoundError())
require_NoError(t, js.DeleteMsg("TEST", 1))
require_Error(t, js.DeleteMsg("TEST", 1), NewJSNoMessageFoundError())
require_Error(t, js.DeleteMsg("TEST", 2), NewJSStreamMsgDeleteFailedError(ErrStoreEOF))
})
}
}

//
// DO NOT ADD NEW TESTS IN THIS FILE (unless to balance test times)
// Add at the end of jetstream_cluster_<n>_test.go, with <n> being the highest value.
Expand Down
Loading