Skip to content
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

[FIXED] Use correct sequence on duplicate message with no interest #5818

Merged
merged 2 commits into from
Aug 23, 2024
Merged

[FIXED] Use correct sequence on duplicate message with no interest #5818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
716077d
Use correct sequence on duplicate message with no interest
MauriceVanVeen Aug 22, 2024
919401e
Correct test names
MauriceVanVeen Aug 23, 2024
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
31 changes: 30 additions & 1 deletion server/jetstream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23468,7 +23468,7 @@ func TestInterestConsumerFilterEdit(t *testing.T) {
}

// https://github.com/nats-io/nats-server/issues/5383
func TestInterestStreamWithFilterSubjectsConsumer(t *testing.T) {
func TestJetStreamInterestStreamWithFilterSubjectsConsumer(t *testing.T) {
s := RunBasicJetStreamServer(t)
defer s.Shutdown()

Expand Down Expand Up @@ -23925,3 +23925,32 @@ func TestJetStreamConsumerStartSequenceNotInStream(t *testing.T) {
require_Equal(t, consumer.asflr, 10)
}()
}

func TestJetStreamInterestStreamWithDuplicateMessages(t *testing.T) {
s := RunBasicJetStreamServer(t)
defer s.Shutdown()

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

cfg := &nats.StreamConfig{
Name: "INTEREST",
Subjects: []string{"interest"},
Replicas: 1,
Retention: nats.InterestPolicy,
}
_, err := js.AddStream(cfg)
require_NoError(t, err)

// Publishing the first time should give a sequence, even when there's no interest.
pa, err := js.Publish("interest", nil, nats.MsgId("dedupe"))
require_NoError(t, err)
require_Equal(t, pa.Sequence, 1)
require_Equal(t, pa.Duplicate, false)

// Publishing a duplicate with no interest should return the same sequence as above.
pa, err = js.Publish("interest", nil, nats.MsgId("dedupe"))
require_NoError(t, err)
require_Equal(t, pa.Sequence, 1)
require_Equal(t, pa.Duplicate, true)
}
2 changes: 1 addition & 1 deletion server/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4793,7 +4793,7 @@ func (mset *stream) processJetStreamMsg(subject, reply string, hdr, msg []byte,
mset.lmsgId = msgId
// If we have a msgId make sure to save.
if msgId != _EMPTY_ {
mset.storeMsgIdLocked(&ddentry{msgId, seq, ts})
mset.storeMsgIdLocked(&ddentry{msgId, mset.lseq, ts})
}
if canRespond {
response = append(pubAck, strconv.FormatUint(mset.lseq, 10)...)
Expand Down