Skip to content

Commit 03b3c1c

Browse files
authored
NO-ISSUE: Update eviction/deletetion logging on failure (#7471)
1 parent 1de1416 commit 03b3c1c

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

internal/controller/controllers/bmh_agent_controller.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -1889,11 +1889,15 @@ func (r *BMACReconciler) drainAgentNode(ctx context.Context, log logrus.FieldLog
18891889
DeleteEmptyDirData: true,
18901890
GracePeriodSeconds: -1,
18911891
Timeout: 20 * time.Second,
1892-
OnPodDeletedOrEvicted: func(pod *corev1.Pod, usingEviction bool) {
1892+
OnPodDeletionOrEvictionFinished: func(pod *corev1.Pod, usingEviction bool, err error) {
18931893
verbStr := "Deleted"
18941894
if usingEviction {
18951895
verbStr = "Evicted"
18961896
}
1897+
if err != nil {
1898+
log.Warnf("%s Pod %s/%s from Node %s, %s", verbStr, pod.Namespace, pod.Name, nodeName, err.Error())
1899+
return
1900+
}
18971901
log.Infof("%s Pod %s/%s from Node %s", verbStr, pod.Namespace, pod.Name, nodeName)
18981902
},
18991903
Out: out,
@@ -1908,7 +1912,7 @@ func (r *BMACReconciler) drainAgentNode(ctx context.Context, log logrus.FieldLog
19081912
return false, errors.Wrapf(err, "failed to cordon node %s", nodeName)
19091913
}
19101914
if err := r.Drainer.RunNodeDrain(drainHelper, nodeName); err != nil {
1911-
log.WithError(err).Warnf("failed to drain node %s within timeout", nodeName)
1915+
log.WithError(err).Warnf("failed to drain node %s within %d timeout", nodeName, drainHelper.Timeout)
19121916
log.Debugf("node %s drain output: %s", nodeName, out)
19131917
return true, nil
19141918
}

0 commit comments

Comments
 (0)