Skip to content

Commit

Permalink
feat(controller): Remove the excessive logging of node data (#2925)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexec committed May 1, 2020
1 parent 03ad694 commit 99858ea
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion workflow/controller/dag.go
Expand Up @@ -394,7 +394,7 @@ func (woc *wfOperationCtx) executeDAGTask(dagCtx *dagContext, taskName string) {
for _, depName := range task.Dependencies {
depNode := dagCtx.GetTaskNode(depName)
outboundNodeIDs := woc.getOutboundNodes(depNode.ID)
woc.log.Infof("DAG outbound nodes of %s are %s", depNode, outboundNodeIDs)
woc.log.Infof("DAG outbound nodes of %s are %s", depNode.ID, outboundNodeIDs)
for _, outNodeID := range outboundNodeIDs {
woc.addChildNode(woc.wf.Status.Nodes[outNodeID].Name, taskNodeName)
}
Expand Down
18 changes: 9 additions & 9 deletions workflow/controller/operator.go
Expand Up @@ -997,20 +997,20 @@ func (woc *wfOperationCtx) assessNodeStatus(pod *apiv1.Pod, node *wfv1.NodeStatu
newDaemonStatus = nil
}
if (newDaemonStatus != nil && node.Daemoned == nil) || (newDaemonStatus == nil && node.Daemoned != nil) {
log.Infof("Setting node %v daemoned: %v -> %v", node, node.Daemoned, newDaemonStatus)
log.Infof("Setting node %v daemoned: %v -> %v", node.ID, node.Daemoned, newDaemonStatus)
node.Daemoned = newDaemonStatus
updated = true
if pod.Status.PodIP != "" && pod.Status.PodIP != node.PodIP {
// only update Pod IP for daemoned nodes to reduce number of updates
log.Infof("Updating daemon node %s IP %s -> %s", node, node.PodIP, pod.Status.PodIP)
log.Infof("Updating daemon node %s IP %s -> %s", node.ID, node.PodIP, pod.Status.PodIP)
node.PodIP = pod.Status.PodIP
}
}
}
outputStr, ok := pod.Annotations[common.AnnotationKeyOutputs]
if ok && node.Outputs == nil {
updated = true
log.Infof("Setting node %v outputs", node)
log.Infof("Setting node %v outputs", node.ID)
var outputs wfv1.Outputs
err := json.Unmarshal([]byte(outputStr), &outputs)
if err != nil {
Expand All @@ -1021,7 +1021,7 @@ func (woc *wfOperationCtx) assessNodeStatus(pod *apiv1.Pod, node *wfv1.NodeStatu
}
}
if node.Phase != newPhase {
log.Infof("Updating node %s status %s -> %s", node, node.Phase, newPhase)
log.Infof("Updating node %s status %s -> %s", node.ID, node.Phase, newPhase)
// if we are transitioning from Pending to a different state, clear out pending message
if node.Phase == wfv1.NodePending {
node.Message = ""
Expand All @@ -1030,7 +1030,7 @@ func (woc *wfOperationCtx) assessNodeStatus(pod *apiv1.Pod, node *wfv1.NodeStatu
node.Phase = newPhase
}
if message != "" && node.Message != message {
log.Infof("Updating node %s message: %s", node, message)
log.Infof("Updating node %s message: %s", node.ID, message)
updated = true
node.Message = message
}
Expand Down Expand Up @@ -1689,7 +1689,7 @@ func (woc *wfOperationCtx) initializeNode(nodeName string, nodeType wfv1.NodeTyp
node.Message = messages[0]
}
woc.wf.Status.Nodes[nodeID] = node
woc.log.Infof("%s node %v initialized %s%s", node.Type, node, node.Phase, message)
woc.log.Infof("%s node %v initialized %s%s", node.Type, node.ID, node.Phase, message)
woc.updated = true
return &node
}
Expand All @@ -1701,20 +1701,20 @@ func (woc *wfOperationCtx) markNodePhase(nodeName string, phase wfv1.NodePhase,
panic(fmt.Sprintf("node %s uninitialized", nodeName))
}
if node.Phase != phase {
woc.log.Infof("node %s phase %s -> %s", node, node.Phase, phase)
woc.log.Infof("node %s phase %s -> %s", node.ID, node.Phase, phase)
node.Phase = phase
woc.updated = true
}
if len(message) > 0 {
if message[0] != node.Message {
woc.log.Infof("node %s message: %s", node, message[0])
woc.log.Infof("node %s message: %s", node.ID, message[0])
node.Message = message[0]
woc.updated = true
}
}
if node.Completed() && node.FinishedAt.IsZero() {
node.FinishedAt = metav1.Time{Time: time.Now().UTC()}
woc.log.Infof("node %s finished: %s", node, node.FinishedAt)
woc.log.Infof("node %s finished: %s", node.ID, node.FinishedAt)
woc.updated = true
}
if woc.updated && node.Completed() {
Expand Down
6 changes: 3 additions & 3 deletions workflow/controller/steps.go
Expand Up @@ -91,7 +91,7 @@ func (woc *wfOperationCtx) executeSteps(nodeName string, tmplCtx *templateresolu
sgNode := woc.executeStepGroup(stepGroup.Steps, sgNodeName, &stepsCtx)

if !sgNode.Completed() {
woc.log.Infof("Workflow step group node %v not yet completed", sgNode)
woc.log.Infof("Workflow step group node %s not yet completed", sgNode.ID)
return node, nil
}

Expand Down Expand Up @@ -239,7 +239,7 @@ func (woc *wfOperationCtx) executeStepGroup(stepGroup []wfv1.WorkflowStep, sgNod
case ErrParallelismReached:
default:
errMsg := fmt.Sprintf("child '%s' errored", childNodeName)
woc.log.Infof("Step group node %s deemed errored due to child %s error: %s", node, childNodeName, err.Error())
woc.log.Infof("Step group node %s deemed errored due to child %s error: %s", node.ID, childNodeName, err.Error())
woc.addChildNode(sgNodeName, childNodeName)
return woc.markNodePhase(node.Name, wfv1.NodeError, errMsg)
}
Expand Down Expand Up @@ -278,7 +278,7 @@ func (woc *wfOperationCtx) executeStepGroup(stepGroup []wfv1.WorkflowStep, sgNod
step := nodeSteps[childNode.Name]
if !childNode.Successful() && !step.ContinuesOn(childNode.Phase) {
failMessage := fmt.Sprintf("child '%s' failed", childNodeID)
woc.log.Infof("Step group node %s deemed failed: %s", node, failMessage)
woc.log.Infof("Step group node %s deemed failed: %s", node.ID, failMessage)
return woc.markNodePhase(node.Name, wfv1.NodeFailed, failMessage)
}
}
Expand Down

0 comments on commit 99858ea

Please sign in to comment.