Import upstream exec driver

exec2/handle.go

@@ -1,4 +1,4 @@
-package hello
+package exec
 
 import (
 	"context"
@@ -6,30 +6,26 @@ import (
 	"sync"
 	"time"
 
-	"github.com/hashicorp/go-hclog"
+	hclog "github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-plugin"
+	plugin "github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/nomad/drivers/shared/executor"
 	"github.com/hashicorp/nomad/plugins/drivers"
 )
 
-// taskHandle should store all relevant runtime information
-// such as process ID if this is a local task or other meta
-// data if this driver deals with external APIs
 type taskHandle struct {
+	exec         executor.Executor
+	pid          int
+	pluginClient *plugin.Client
+	logger       hclog.Logger
+
 	// stateLock syncs access to all fields below
 	stateLock sync.RWMutex
 
-	logger       hclog.Logger
+	taskConfig  *drivers.TaskConfig
-	exec         executor.Executor
+	procState   drivers.TaskState
-	pluginClient *plugin.Client
+	startedAt   time.Time
-	taskConfig   *drivers.TaskConfig
+	completedAt time.Time
-	procState    drivers.TaskState
+	exitResult  *drivers.ExitResult
-	startedAt    time.Time
-	completedAt  time.Time
-	exitResult   *drivers.ExitResult
-
-	// TODO: add any extra relevant information about the task.
-	pid int
 }
 
 func (h *taskHandle) TaskStatus() *drivers.TaskStatus {
@@ -62,8 +58,9 @@ func (h *taskHandle) run() {
 	}
 	h.stateLock.Unlock()
 
-	// TODO: wait for your task to complete and upate its state.
+	// Block until process exits
 	ps, err := h.exec.Wait(context.Background())
+
 	h.stateLock.Lock()
 	defer h.stateLock.Unlock()
 
@@ -77,4 +74,6 @@ func (h *taskHandle) run() {
 	h.exitResult.ExitCode = ps.ExitCode
 	h.exitResult.Signal = ps.Signal
 	h.completedAt = ps.Time
+
+	// TODO: detect if the task OOMed
 }

exec2/pull-upstream.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+REF=v1.4.3
+
+wget https://github.com/hashicorp/nomad/raw/${REF}/drivers/exec/driver.go -O driver.go
+wget https://github.com/hashicorp/nomad/raw/${REF}/drivers/exec/handle.go -O handle.go
+wget https://github.com/hashicorp/nomad/raw/${REF}/drivers/exec/state.go -O state.go

exec2/state.go

@@ -1,12 +1,9 @@
-package hello
+package exec
 
 import (
 	"sync"
 )
 
-// taskStore provides a mechanism to store and retrieve
-// task handles given a string identifier. The ID should
-// be unique per task
 type taskStore struct {
 	store map[string]*taskHandle
 	lock  sync.RWMutex