NRG (2.11): Truncate entries without quorum from different `pterm`

nats-io / nats-server

High-Performance server for NATS.io, the cloud and edge native messaging system.

https://nats.io

Apache License 2.0

16.01k stars 1.41k forks source link

Closed MauriceVanVeen closed 4 weeks ago

MauriceVanVeen commented 1 month ago

Reverts the changes made in https://github.com/nats-io/nats-server/pull/5987, but the tests are kept.

Instead opting for a simpler approach:

removing the isNew condition when pterm or pindex don't match, to ensure consistency even during catchup
move the ae.pindex == n.pindex condition up so pterm can be corrected (otherwise it would not be executed)

Signed-off-by: Maurice van Veen github@mauricevanveen.com

derekcollison commented 4 weeks ago

@mprimi you good with this PR?

mprimi commented 4 weeks ago

@derekcollison yes, we reviewed this morning and i am onboard.