From 8a57913a44cadbb2e54e3aa8dc024ec48087d810 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 2 Sep 2016 15:41:41 -0700 Subject: [PATCH] A nil context isn't an error --- client/alloc_runner.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/client/alloc_runner.go b/client/alloc_runner.go index 00d767464..3454450bc 100644 --- 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 }