From 79eccb2b1ee4a5134f41bafc3a8ace2ea886d2d1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 13 Oct 2017 17:07:49 +0200
Subject: [PATCH] Remove AllocID from ExecutorContext

---
 client/driver/docker.go            | 1 -
 client/driver/exec.go              | 1 -
 client/driver/executor/executor.go | 3 ---
 client/driver/java.go              | 1 -
 client/driver/qemu.go              | 1 -
 client/driver/raw_exec.go          | 1 -
 6 files changed, 8 deletions(-)

diff --git a/client/driver/docker.go b/client/driver/docker.go
index 4c4e73b40..639a7be57 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -614,7 +614,6 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (*StartRespon
 		TaskEnv:        ctx.TaskEnv,
 		Task:           task,
 		Driver:         "docker",
-		AllocID:        d.DriverContext.allocID,
 		LogDir:         ctx.TaskDir.LogDir,
 		TaskDir:        ctx.TaskDir.Dir,
 		PortLowerBound: d.config.ClientMinPort,
diff --git a/client/driver/exec.go b/client/driver/exec.go
index 9b0772847..c06b4a330 100644
--- a/client/driver/exec.go
+++ b/client/driver/exec.go
@@ -120,7 +120,6 @@ func (d *ExecDriver) Start(ctx *ExecContext, task *structs.Task) (*StartResponse
 	executorCtx := &executor.ExecutorContext{
 		TaskEnv: ctx.TaskEnv,
 		Driver:  "exec",
-		AllocID: d.DriverContext.allocID,
 		LogDir:  ctx.TaskDir.LogDir,
 		TaskDir: ctx.TaskDir.Dir,
 		Task:    task,
diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go
index 4153a9778..a3073e1ee 100644
--- a/client/driver/executor/executor.go
+++ b/client/driver/executor/executor.go
@@ -71,9 +71,6 @@ type ExecutorContext struct {
 	// Task is the task whose executor is being launched
 	Task *structs.Task
 
-	// AllocID is the allocation id to which the task belongs
-	AllocID string
-
 	// TaskDir is the host path to the task's root
 	TaskDir string
 
diff --git a/client/driver/java.go b/client/driver/java.go
index 580eb7e55..40c4789be 100644
--- a/client/driver/java.go
+++ b/client/driver/java.go
@@ -251,7 +251,6 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (*StartResponse
 	executorCtx := &executor.ExecutorContext{
 		TaskEnv: ctx.TaskEnv,
 		Driver:  "java",
-		AllocID: d.DriverContext.allocID,
 		Task:    task,
 		TaskDir: ctx.TaskDir.Dir,
 		LogDir:  ctx.TaskDir.LogDir,
diff --git a/client/driver/qemu.go b/client/driver/qemu.go
index 115ac9b06..1d1f11695 100644
--- a/client/driver/qemu.go
+++ b/client/driver/qemu.go
@@ -253,7 +253,6 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (*StartResponse
 	executorCtx := &executor.ExecutorContext{
 		TaskEnv: ctx.TaskEnv,
 		Driver:  "qemu",
-		AllocID: d.DriverContext.allocID,
 		Task:    task,
 		TaskDir: ctx.TaskDir.Dir,
 		LogDir:  ctx.TaskDir.LogDir,
diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go
index 9e0c34465..966a2affb 100644
--- a/client/driver/raw_exec.go
+++ b/client/driver/raw_exec.go
@@ -135,7 +135,6 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (*StartRespo
 	executorCtx := &executor.ExecutorContext{
 		TaskEnv: ctx.TaskEnv,
 		Driver:  "raw_exec",
-		AllocID: d.DriverContext.allocID,
 		Task:    task,
 		TaskDir: ctx.TaskDir.Dir,
 		LogDir:  ctx.TaskDir.LogDir,