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.

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

remove pre-0.9 driver code and related E2E test #12791

Merged
merged 4 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/12791.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
drivers: removed support for restoring tasks created before Nomad 0.9
```
5 changes: 0 additions & 5 deletions drivers/docker/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
return nil
}

// COMPAT(0.10): pre 0.9 upgrade path check
if handle.Version == 0 {
return d.recoverPre09Task(handle)
}

var handleState taskHandleState
if err := handle.GetDriverState(&handleState); err != nil {
return fmt.Errorf("failed to decode driver task state: %v", err)
Expand Down
78 changes: 0 additions & 78 deletions drivers/docker/driver_pre09.go

This file was deleted.

5 changes: 0 additions & 5 deletions drivers/exec/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,6 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
return fmt.Errorf("handle cannot be nil")
}

// COMPAT(0.10): pre 0.9 upgrade path check
if handle.Version == 0 {
return d.recoverPre09Task(handle)
}

// If already attached to handle there's nothing to recover.
if _, ok := d.tasks.Get(handle.Config.ID); ok {
d.logger.Trace("nothing to recover; task already exists",
Expand Down
46 changes: 0 additions & 46 deletions drivers/exec/driver_pre09.go

This file was deleted.

5 changes: 0 additions & 5 deletions drivers/java/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,6 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
return fmt.Errorf("handle cannot be nil")
}

// COMPAT(0.10): pre 0.9 upgrade path check
if handle.Version == 0 {
return d.recoverPre09Task(handle)
}

// If already attached to handle there's nothing to recover.
if _, ok := d.tasks.Get(handle.Config.ID); ok {
d.logger.Debug("nothing to recover; task already exists",
Expand Down
46 changes: 0 additions & 46 deletions drivers/java/driver_pre09.go

This file was deleted.

5 changes: 0 additions & 5 deletions drivers/qemu/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,6 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
return fmt.Errorf("error: handle cannot be nil")
}

// COMPAT(0.10): pre 0.9 upgrade path check
if handle.Version == 0 {
return d.recoverPre09Task(handle)
}

// If already attached to handle there's nothing to recover.
if _, ok := d.tasks.Get(handle.Config.ID); ok {
d.logger.Trace("nothing to recover; task already exists",
Expand Down
46 changes: 0 additions & 46 deletions drivers/qemu/driver_pre09.go

This file was deleted.

5 changes: 0 additions & 5 deletions drivers/rawexec/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,6 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
return fmt.Errorf("handle cannot be nil")
}

// COMPAT(0.10): pre 0.9 upgrade path check
if handle.Version == 0 {
return d.recoverPre09Task(handle)
}

// If already attached to handle there's nothing to recover.
if _, ok := d.tasks.Get(handle.Config.ID); ok {
d.logger.Trace("nothing to recover; task already exists",
Expand Down
47 changes: 0 additions & 47 deletions drivers/rawexec/driver_pre09.go

This file was deleted.

Loading