From 828151ea38f5d4d0d58de0cdaed3cac616d52bd8 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 19 Jan 2017 15:07:01 -0800 Subject: [PATCH] Exit early when cleanup succeeds --- client/task_runner.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/task_runner.go b/client/task_runner.go index 31076ccb1..399c0de24 100644 --- a/client/task_runner.go +++ b/client/task_runner.go @@ -1038,9 +1038,11 @@ func (r *TaskRunner) cleanup() { var cleanupErr error for retry := true; retry; attempts++ { retry = false - if cleanupErr = drv.Cleanup(ctx, res); cleanupErr != nil { - retry = structs.IsRecoverable(cleanupErr) + cleanupErr = drv.Cleanup(ctx, res) + if cleanupErr == nil { + return } + retry = structs.IsRecoverable(cleanupErr) // Copy current createdResources state in case SaveState is // called between retries