Skip to content

Commit

Permalink
fsm: fix bug in snapshot restore for removed timetable (#24412)
Browse files Browse the repository at this point in the history
When we removed the time table in #24112 we introduced a bug where if a previous
version of Nomad had written a time table entry, we'd return from the restore
loop early and never load the rest of the FSM. This will result in a mostly or
partially wiped state for that Nomad node, which would then be out of sync with
its peers (which would also have the same problem on upgrade).

The bug only occurs when the FSM is being restored from snapshot, which isn't
the case if you test with a server that's only written Raft logs and not
snapshotted them.

While fixing this bug, we still need to ensure we're reading the time table
entries even if we're throwing them away, so that we move the snapshot reader
along to the next full entry.

Fixes: #24411
  • Loading branch information
tgross authored Nov 11, 2024
1 parent 0714353 commit 6459232
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions nomad/fsm.go
Original file line number Diff line number Diff line change
Expand Up @@ -1564,9 +1564,13 @@ func (n *nomadFSM) restoreImpl(old io.ReadCloser, filter *FSMFilter) error {
snapType := SnapshotType(msgType[0])
switch snapType {
case TimeTableSnapshot:
// COMPAT: Nomad 1.9.2 removed the timetable, this case kept to gracefully handle
// tt snapshot requests
return nil
// COMPAT: Nomad 1.9.2 removed the timetable, this case kept to
// gracefully handle tt snapshot requests
var table []TimeTableEntry
if err := dec.Decode(&table); err != nil {
return err
}

case NodeSnapshot:
node := new(structs.Node)
if err := dec.Decode(node); err != nil {
Expand Down Expand Up @@ -3311,3 +3315,10 @@ func (s SnapshotType) String() string {
}
return fmt.Sprintf("Unknown(%d)", s)
}

// TimeTableEntry was used to track a time and index, but has been removed. We
// still need to deserialize existing entries
type TimeTableEntry struct {
Index uint64
Time time.Time
}

0 comments on commit 6459232

Please sign in to comment.