From cf62d0237878f65be62df604579043399b272d66 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 21 Jul 2017 16:16:02 -0700 Subject: [PATCH] Remove unneeded saveTaskRunnerState method Collapse it into the one place it's called --- client/alloc_runner.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/client/alloc_runner.go b/client/alloc_runner.go index 4d58e1a1a..a04ab7e86 100644 --- a/client/alloc_runner.go +++ b/client/alloc_runner.go @@ -348,8 +348,9 @@ func (r *AllocRunner) SaveState() error { runners := r.getTaskRunners() var mErr multierror.Error for _, tr := range runners { - if err := r.saveTaskRunnerState(tr); err != nil { - mErr.Errors = append(mErr.Errors, err) + if err := tr.SaveState(); err != nil { + mErr.Errors = append(mErr.Errors, fmt.Errorf("failed to save state for alloc %s task %q: %v", + r.allocID, tr.task.Name, err)) } } return mErr.ErrorOrNil() @@ -446,14 +447,6 @@ func (r *AllocRunner) saveAllocRunnerState() error { }) } -func (r *AllocRunner) saveTaskRunnerState(tr *TaskRunner) error { - if err := tr.SaveState(); err != nil { - return fmt.Errorf("failed to save state for alloc %s task '%s': %v", - r.allocID, tr.task.Name, err) - } - return nil -} - // DestroyState is used to cleanup after ourselves func (r *AllocRunner) DestroyState() error { r.allocStateLock.Lock()