Code

Cherry-picks for 2.10.23-RC.5#6171

Code

Merged

neilalexander merged 36 commits intorelease/v2.10.23nats-io/nats-server:release/v2.10.23from neil/21023rc5nats-io/nats-server:neil/21023rc5Copy head branch name to clipboardNov 25, 2024

+1,646-737

Commits

Commits on Nov 22, 2024

• NRG: Ignore AEs from older terms

  Show description for 785321b
  

  neilalexander

  and

  ReubenMathew

  committed
  785321b

• NRG: Ensure proposal and AE response queues drain after stepdown

  Show description for ddb3ad3
  neilalexander

  committed
  ddb3ad3

• NRG: Fix term handling in candidate state and use higher term from vote request

  Show description for 6f3d87f
  

  neilalexander

  and

  ReubenMathew

  committed
  6f3d87f

• NRG: Remove stepdown channel, handle inline

  Show description for e52d3e1
  neilalexander

  committed
  e52d3e1

• NRG: Don't revert term to pterm on AE mismatch

  Show description for 937e786
  neilalexander

  committed
  937e786

• NRG: Don't reset WAL on append entry response

  Show description for 4b725df
  neilalexander

  committed
  4b725df

• NRG: De-flake TestNRGSwitchStateClearsQueues

  Show description for 9e1d1c3
  neilalexander

  committed
  9e1d1c3

• De-flake TestNRGSwitchStateClearsQueues

  Show description for d6f1f9c
  neilalexander

  committed
  d6f1f9c

• NRG: Send AE response when term is lower than ours

  Show description for 541e5b1
  neilalexander

  committed
  541e5b1

• Fix candidate stepdown logic

  Show description for 86b0cae
  

  ReubenMathew

  authored and

  neilalexander

  committed
  86b0cae

• De-flake TestNRGSwitchStateClearsQueues

  Show description for 85ad22d
  neilalexander

  committed
  85ad22d

• NRG: Don't revert pterm to beginning of log when installing snapshots

  Show description for 1929e30
  neilalexander

  committed
  1929e30

• Fixed deadlock when removing a peer that happened to be the leader.

  Show description for 85236e2
  

  derekcollison

  authored and

  neilalexander

  committed
  85236e2

• Fix drift in WAL, truncate AppendEntry without quorum

  Show description for 947b7c5
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  947b7c5

Commits on Nov 25, 2024

• (2.11) Don't send meta snapshot when becoming metaleader (#5700)

  Show description for 7a6affa
  

  neilalexander

  and

  MauriceVanVeen

  committed
  7a6affa

• NRG: Do not revert term on truncate WAL

  Show description for 71e9e87
  

  neilalexander

  and

  MauriceVanVeen

  committed
  71e9e87

• Fix data race in TestNRGTermDoesntRollBackToPtermOnCatchup

  Show description for f55f34e
  neilalexander

  committed
  f55f34e

• NRG (2.11): Start catchup from n.commit & fix AppendEntry is stored at seq=ae.pindex+1 (#5987)

  Show description for 3025778
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  3025778

• NRG: Revert implementation from #5987

  Show description for 7ec99f3
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  7ec99f3

• NRG: Correct pterm if mismatched & don't truncate what was already committed

  Show description for a5b7a4f
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  a5b7a4f

• NRG: Add tests for correcting pterm with committed entries

  Show description for 2dfb1d4
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  2dfb1d4

• [FIXED] Catchup must not extend past requested sequence range

  Show description for 6e36c52
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  6e36c52

• [FIXED] Don't replace leader's snapshot during shutdown

  Show description for aa643dd
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  aa643dd

• NRG: Always write term/vote and peer state synchronously

  Show description for 2681ce0
  neilalexander

  committed
  2681ce0

• [FIXED] Don't remove snapshot if truncate to applied

  Show description for ff22481
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  ff22481

• NRG: Don't switch to candidate when waiting for pending applies

  Show description for e40112e
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  e40112e

• NRG: Do not set pterm/pindex if no snapshots and/or log entries

  Show description for 8a4f379
  neilalexander

  committed
  8a4f379

• NRG: Don't delete RAFT state if stream/consumer creation failed during shutdown

  Show description for fa5128d
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  fa5128d

• NRG: Vote request cancels catchup, new leader could have rejected subsequent catchup messages

  Show description for a3b9178
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  a3b9178

• NRG: Wait for goroutines to shutdown when recreating group

  Show description for a64c5bd
  neilalexander

  committed
  a64c5bd

• NRG: Update group peers if mismatched

  Show description for cc204b0
  neilalexander

  committed
  cc204b0

• NRG: Refactor shutdown, update switchState to CAS

  Show description for a838553
  neilalexander

  committed
  a838553

• NRG: Use correct sequence when truncating to previous pterm/pindex

  Show description for 9266be8
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  9266be8

• De-flake TestNRGCandidateDontStepdownDueToLeaderOfPreviousTerm

  Show description for 9e4c421
  neilalexander

  committed
  9e4c421

• De-flake TestNRGSimpleElection

  Show description for 7c0bec1
  neilalexander

  committed
  7c0bec1

• NRG: Don't delete RAFT state if stream/consumer creation failed during shutdown

  Show description for 4606175
  

  MauriceVanVeen

  authored and

  neilalexander

  committed
  4606175