Skip to content

Commit

Permalink
[FIXED] Fix for a regression in behavior. (#4057)
Browse files Browse the repository at this point in the history
When tracking information per subject went from >1 back to only 1 we
needed to make sure we cleared firstNeedsUpdate.

Thanks to @scottf for finding it.

Signed-off-by: Derek Collison <derek@nats.io>
  • Loading branch information
derekcollison committed Apr 15, 2023
2 parents 816cd82 + 034975e commit 2ee73f8
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 0 deletions.
1 change: 1 addition & 0 deletions server/filestore.go
Expand Up @@ -5731,6 +5731,7 @@ func (mb *msgBlock) removeSeqPerSubject(subj string, seq uint64) {
} else {
ss.First = ss.Last
}
ss.firstNeedsUpdate = false
mb.fssNeedsWrite = true // Mark dirty
return
}
Expand Down
56 changes: 56 additions & 0 deletions server/jetstream_test.go
Expand Up @@ -19912,3 +19912,59 @@ func TestJetStreamStreamUpdateWithExternalSource(t *testing.T) {
require_Error(t, err)
require_True(t, strings.Contains(err.Error(), "does not overlap"))
}

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

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

for _, storage := range []nats.StorageType{nats.FileStorage, nats.MemoryStorage} {
t.Run(storage.String(), func(t *testing.T) {
js.DeleteKeyValue("TEST")

kv, err := js.CreateKeyValue(&nats.KeyValueConfig{
Bucket: "TEST",
History: 4,
Storage: storage,
})
require_NoError(t, err)

r1, err := kv.Create("foo", []byte("a"))
require_NoError(t, err)

_, err = kv.Update("foo", []byte("ab"), r1)
require_NoError(t, err)

err = kv.Delete("foo")
require_NoError(t, err)

_, err = kv.Create("foo", []byte("abc"))
require_NoError(t, err)

err = kv.Delete("foo")
require_NoError(t, err)

history, err := kv.History("foo")
require_NoError(t, err)
require_True(t, len(history) == 4)

_, err = kv.Update("foo", []byte("abcd"), history[len(history)-1].Revision())
require_NoError(t, err)

err = kv.Purge("foo")
require_NoError(t, err)

_, err = kv.Create("foo", []byte("abcde"))
require_NoError(t, err)

err = kv.Purge("foo")
require_NoError(t, err)

history, err = kv.History("foo")
require_NoError(t, err)
require_True(t, len(history) == 1)
})
}
}
1 change: 1 addition & 0 deletions server/memstore.go
Expand Up @@ -1004,6 +1004,7 @@ func (ms *memStore) removeSeqPerSubject(subj string, seq uint64) {
} else {
ss.First = ss.Last
}
ss.firstNeedsUpdate = false
} else {
ss.firstNeedsUpdate = seq == ss.First || ss.firstNeedsUpdate
}
Expand Down

0 comments on commit 2ee73f8

Please sign in to comment.