fix bug-1060 bug-1067

This commit is contained in:
Rongsong Shen 2026-06-24 17:05:43 +08:00
parent 6067ba6c94
commit 61e1391cd0
28 changed files with 7021 additions and 2926 deletions

View file

@ -364,6 +364,14 @@ struct wal_catchup_entry {
* the AppendEntries so the standby intake passes it into
* raft_on_append_entries_request. Wire field leaderCommit @7. */
uint64_t leader_commit;
/* bug-1067: the streaming leader's CURRENT term — the Raft AppendEntries
* HEADER term, DISTINCT from `term` above (the entry's STORED term). Equal for
* a live append; for a HISTORICAL catch-up entry the stored term is lower than
* the leader's current term. The standby intake uses this as the AE header
* term (UpdateTerm/stale-check) so cross-term catch-up is not stale-rejected;
* 0 = unset (legacy sender) → fall back to the stored term. Wire field
* leaderCurrentTerm @8. */
uint64_t leader_current_term;
};
/* ── Persistence Cap'n Proto mapped types (P0-9) ─────────────────────