remove remote task execution code (#24909)

hashicorp · Jan 29, 2025 · 47c14dd · 47c14dd
1 parent dcf6201
commit 47c14dd
Show file tree

Hide file tree

Showing 25 changed files with 264 additions and 1,313 deletions.
diff --git a/.changelog/24909.txt b/.changelog/24909.txt
@@ -0,0 +1,3 @@
+```release-note:breaking-change
+drivers: remove remote task support for task drivers
+```
diff --git a/api/tasks.go b/api/tasks.go
@@ -1112,17 +1112,6 @@ type TaskState struct {
 	StartedAt   time.Time
 	FinishedAt  time.Time
 	Events      []*TaskEvent
-
-	// Experimental -  TaskHandle is based on drivers.TaskHandle and used
-	// by remote task drivers to migrate task handles between allocations.
-	TaskHandle *TaskHandle
-}
-
-// Experimental - TaskHandle is based on drivers.TaskHandle and used by remote
-// task drivers to migrate task handles between allocations.
-type TaskHandle struct {
-	Version     int
-	DriverState []byte
 }
 
 const (

diff --git a/client/allocrunner/taskrunner/remotetask_hook.go b/client/allocrunner/taskrunner/remotetask_hook.go
diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go
@@ -1364,12 +1364,6 @@ func (tr *TaskRunner) UpdateState(state string, event *structs.TaskEvent) {
 		tr.logger.Error("error persisting task state", "error", err, "event", event, "state", state)
 	}
 
-	// Store task handle for remote tasks
-	if tr.driverCapabilities != nil && tr.driverCapabilities.RemoteTasks {
-		tr.logger.Trace("storing remote task handle state")
-		tr.localState.TaskHandle.Store(tr.state)
-	}
-
 	// Notify the alloc runner of the transition
 	tr.stateUpdater.TaskStateUpdated()
 }

diff --git a/client/allocrunner/taskrunner/task_runner_hooks.go b/client/allocrunner/taskrunner/task_runner_hooks.go
@@ -187,12 +187,6 @@ func (tr *TaskRunner) initHooks() {
 		logger: hookLogger,
 	}))
 
-	// If this task driver has remote capabilities, add the remote task
-	// hook.
-	if tr.driverCapabilities.RemoteTasks {
-		tr.runnerHooks = append(tr.runnerHooks, newRemoteTaskHook(tr, hookLogger))
-	}
-
 	// If this task has a pause schedule, initialize the pause (Enterprise)
 	if task.Schedule != nil {
 		tr.runnerHooks = append(tr.runnerHooks, newPauseHook(tr, hookLogger))

diff --git a/drivers/docker/config_test.go b/drivers/docker/config_test.go
@@ -646,7 +646,6 @@ func TestConfig_Capabilities(t *testing.T) {
 				NetIsolationModes:    []drivers.NetIsolationMode{"host", "group", "task"},
 				MustInitiateNetwork:  true,
 				MountConfigs:         0,
-				RemoteTasks:          false,
 				DisableLogCollection: false,
 			},
 		},
@@ -660,7 +659,6 @@ func TestConfig_Capabilities(t *testing.T) {
 				NetIsolationModes:    []drivers.NetIsolationMode{"host", "group", "task"},
 				MustInitiateNetwork:  true,
 				MountConfigs:         0,
-				RemoteTasks:          false,
 				DisableLogCollection: true,
 			},
 		},
@@ -674,7 +672,6 @@ func TestConfig_Capabilities(t *testing.T) {
 				NetIsolationModes:    []drivers.NetIsolationMode{"host", "group", "task"},
 				MustInitiateNetwork:  true,
 				MountConfigs:         0,
-				RemoteTasks:          false,
 				DisableLogCollection: false,
 			},
 		},

diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -23,7 +23,6 @@ import (
 	_ "github.com/hashicorp/nomad/e2e/parameterized"
 	_ "github.com/hashicorp/nomad/e2e/periodic"
 	_ "github.com/hashicorp/nomad/e2e/quotas"
-	_ "github.com/hashicorp/nomad/e2e/remotetasks"
 	_ "github.com/hashicorp/nomad/e2e/scaling"
 	_ "github.com/hashicorp/nomad/e2e/scalingpolicies"
 	_ "github.com/hashicorp/nomad/e2e/scheduler_sysbatch"

diff --git a/e2e/remotetasks/input/ecs.nomad b/e2e/remotetasks/input/ecs.nomad