A nil context isn't an error

hashicorp · Sep 2, 2016 · fe9fe4c · fe9fe4c
1 parent 8cb85ed
commit fe9fe4c
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/client/alloc_runner.go b/client/alloc_runner.go
@@ -51,13 +51,14 @@ type AllocRunner struct {
 
 	dirtyCh chan struct{}
 
-	ctx        *driver.ExecContext
-	ctxLock    sync.Mutex
-	tasks      map[string]*TaskRunner
-	taskStates map[string]*structs.TaskState
-	restored   map[string]struct{}
-	taskLock   sync.RWMutex
+	ctx     *driver.ExecContext
+	ctxLock sync.Mutex
 
+	tasks    map[string]*TaskRunner
+	restored map[string]struct{}
+	taskLock sync.RWMutex
+
+	taskStates     map[string]*structs.TaskState
 	taskStatusLock sync.RWMutex
 
 	updateCh chan *structs.Allocation
@@ -126,9 +127,6 @@ func (r *AllocRunner) RestoreState() error {
 	if r.alloc == nil {
 		snapshotErrors.Errors = append(snapshotErrors.Errors, fmt.Errorf("alloc_runner snapshot includes a nil allocation"))
 	}
-	if r.ctx == nil {
-		snapshotErrors.Errors = append(snapshotErrors.Errors, fmt.Errorf("alloc_runner snapshot includes a nil context"))
-	}
 	if e := snapshotErrors.ErrorOrNil(); e != nil {
 		return e
 	}