Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fsm: fix bug in snapshot restore for removed timetable #24412

Merged
merged 1 commit into from
Nov 11, 2024
Merged

fsm: fix bug in snapshot restore for removed timetable #24412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions nomad/fsm.go
View file
Open in desktop
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
}