Issue argoproj#1040 - Kill daemoned step if workflow consist of singl…

…e daemoned step (argoproj#1144)
ian-howell · Dec 28, 2018 · 174eb20 · 174eb20
1 parent e078032
commit 174eb20
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/workflow/controller/dag.go b/workflow/controller/dag.go
@@ -126,7 +126,7 @@ func (woc *wfOperationCtx) executeDAG(nodeName string, tmpl *wfv1.Template, boun
  }
  defer func() {
  if node != nil && woc.wf.Status.Nodes[node.ID].Completed() {
- _ = woc.killDeamonedChildren(node.ID)
+ _ = woc.killDaemonedChildren(node.ID)
  }
  }()
 

diff --git a/workflow/controller/exec_control.go b/workflow/controller/exec_control.go
@@ -64,9 +64,9 @@ func (woc *wfOperationCtx) applyExecutionControl(pod *apiv1.Pod) error {
  return woc.updateExecutionControl(pod.Name, desiredExecCtl)
 }
 
-// killDeamonedChildren kill any daemoned pods of a steps or DAG template node.
-func (woc *wfOperationCtx) killDeamonedChildren(nodeID string) error {
- woc.log.Infof("Checking deamoned children of %s", nodeID)
+// killDaemonedChildren kill any daemoned pods of a steps or DAG template node.
+func (woc *wfOperationCtx) killDaemonedChildren(nodeID string) error {
+ woc.log.Infof("Checking daemoned children of %s", nodeID)
  var firstErr error
  execCtl := common.ExecutionControl{
  Deadline: &time.Time{},

diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -103,7 +103,12 @@ func newWorkflowOperationCtx(wf *wfv1.Workflow, wfc *WorkflowController) *wfOper
 // TODO: an error returned by this method should result in requeuing the workflow to be retried at a
 // later time
 func (woc *wfOperationCtx) operate() {
- defer woc.persistUpdates()
+ defer func() {
+ if woc.wf.Status.Completed() {
+ _ = woc.killDaemonedChildren("")
+ }
+ woc.persistUpdates()
+ }()
  defer func() {
  if r := recover(); r != nil {
  if rerr, ok := r.(error); ok {

diff --git a/workflow/controller/steps.go b/workflow/controller/steps.go
@@ -28,7 +28,7 @@ func (woc *wfOperationCtx) executeSteps(nodeName string, tmpl *wfv1.Template, bo
  }
  defer func() {
  if woc.wf.Status.Nodes[node.ID].Completed() {
- _ = woc.killDeamonedChildren(node.ID)
+ _ = woc.killDaemonedChildren(node.ID)
  }
  }()
  stepsCtx := stepsContext{