mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-11 08:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert DeepEqual part as it does the wrong thing with stream defaults

Browse source
This commit is contained in:
Neil Twigg 2023-07-07 17:23:35 +01:00
parent 781b52768c
commit 2452b5d79d
No known key found for this signature in database
GPG key ID: 8993BAD6C5E51CD8
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
setup/jetstream/nats.go
View file

@ -125,10 +125,24 @@ func setupNATS(process *process.ProcessContext, cfg *config.JetStream, nc *natsc
// with the subject "Foo", "Foo.Bar" or "Foo.Bar.Baz" etc. // with the subject "Foo", "Foo.Bar" or "Foo.Bar.Baz" etc.
subjects = []string{name, name + ".>"} subjects = []string{name, name + ".>"}
} }
if info != nil && !reflect.DeepEqual(info.Config, stream) { if info != nil {
// If the stream config doesn't match what we expect, try to update // If the stream config doesn't match what we expect, try to update
// it. If that doesn't work then try to blow it away and we'll then // it. If that doesn't work then try to blow it away and we'll then
// recreate it in the next section. // recreate it in the next section.
// Each specific option that we set must be checked by hand, as if
// you DeepEqual the whole config struct, it will always show that
// there's a difference because the NATS Server will return defaults
// in the stream info.
switch {
case !reflect.DeepEqual(info.Config.Subjects, subjects):
fallthrough
case info.Config.Retention != stream.Retention:
fallthrough
case info.Config.Storage != stream.Storage:
fallthrough
case info.Config.MaxAge != stream.MaxAge:
// Try updating the stream first, as many things can be updated
// non-destructively.
if info, err = s.UpdateStream(stream); err != nil { if info, err = s.UpdateStream(stream); err != nil {
logrus.WithError(err).Warnf("Unable to update stream %q, recreating...", name) logrus.WithError(err).Warnf("Unable to update stream %q, recreating...", name)
// We failed to update the stream, this is a last attempt to get // We failed to update the stream, this is a last attempt to get
@ -139,6 +153,7 @@ func setupNATS(process *process.ProcessContext, cfg *config.JetStream, nc *natsc
info = nil info = nil
} }
} }
}
if info == nil { if info == nil {
// If we're trying to keep everything in memory (e.g. unit tests) // If we're trying to keep everything in memory (e.g. unit tests)
// then overwrite the storage policy. // then overwrite the storage policy.