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

Backport of fsm: handle EventSinkSnapshot type correctly into release/1.9.x #24440

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Backport of fsm: handle EventSinkSnapshot type correctly into release/1.9.x #24440

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
15 changes: 11 additions & 4 deletions nomad/fsm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const (
IndexSnapshot SnapshotType = 2
EvalSnapshot SnapshotType = 3
AllocSnapshot SnapshotType = 4
TimeTableSnapshot SnapshotType = 5
PeriodicLaunchSnapshot SnapshotType = 6
JobSummarySnapshot SnapshotType = 7
VaultAccessorSnapshot SnapshotType = 8
Expand All @@ -48,7 +47,6 @@ const (
CSIPluginSnapshot SnapshotType = 17
CSIVolumeSnapshot SnapshotType = 18
ScalingEventsSnapshot SnapshotType = 19
EventSinkSnapshot SnapshotType = 20
ServiceRegistrationSnapshot SnapshotType = 21
VariablesSnapshot SnapshotType = 22
VariablesQuotaSnapshot SnapshotType = 23
Expand All @@ -60,6 +58,14 @@ const (
JobSubmissionSnapshot SnapshotType = 29
RootKeySnapshot SnapshotType = 30

// TimeTableSnapshot
// Deprecated: Nomad no longer supports TimeTable snapshots since 1.9.2
TimeTableSnapshot SnapshotType = 5

// EventSinkSnapshot
// Deprecated: Nomad no longer supports EventSink snapshots since 1.0
EventSinkSnapshot SnapshotType = 20

// Namespace appliers were moved from enterprise and therefore start at 64
NamespaceSnapshot SnapshotType = 64
)
Expand Down Expand Up @@ -1796,9 +1802,10 @@ func (n *nomadFSM) restoreImpl(old io.ReadCloser, filter *FSMFilter) error {
return err
}

// COMPAT(1.0): Allow 1.0-beta clusterers to gracefully handle
// DEPRECATED: EventSinkSnapshot type only available in pre-1.0 Nomad
case EventSinkSnapshot:
return nil
return fmt.Errorf(
"EventSinkSnapshot is an unsupported snapshot type since Nomad 1.0. Executing this code path means state corruption!")

case ServiceRegistrationSnapshot:
serviceRegistration := new(structs.ServiceRegistration)
Expand Down