abort then finalize

flyteorg · Apr 24, 2020 · ad4ce20 · ad4ce20
1 parent 5f5d1a9
commit ad4ce20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/go/tasks/plugins/array/k8s/launcher.go b/go/tasks/plugins/array/k8s/launcher.go
@@ -70,11 +70,12 @@ func TerminateSubTasks(ctx context.Context, tCtx core.TaskExecutionContext, kube
 			Config:   config,
 			State:    currentState,
 		}
-		err := task.Finalize(ctx, tCtx, kubeClient)
+
+		err := task.Abort(ctx, tCtx, kubeClient)
 		if err != nil {
 			errs.Collect(childIdx, err.Error())
 		}
-		err = task.Abort(ctx, tCtx, kubeClient)
+		err = task.Finalize(ctx, tCtx, kubeClient)
 		if err != nil {
 			errs.Collect(childIdx, err.Error())
 		}

diff --git a/go/tasks/plugins/array/k8s/task.go b/go/tasks/plugins/array/k8s/task.go
@@ -175,13 +175,6 @@ func (t Task) Abort(ctx context.Context, tCtx core.TaskExecutionContext, kubeCli
 		return err
 	}
 
-	// Deallocate Resource
-	err = deallocateResource(ctx, tCtx, t.Config, t.ChildIdx)
-	if err != nil {
-		logger.Errorf(ctx, "Error releasing allocation token [%s] in Finalize [%s]", podName, err)
-		return err
-	}
-
 	return nil
 
 }