root
/
kubernetes
mirror of https://github.com/kubernetes/kubernetes.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #42633 from gmarek/nc_logs 

Automatic merge from submit-queue (batch tested with PRs 41890, 42593, 42633, 42626, 42609)

Improve NodeControllers logs
This commit is contained in:
Kubernetes Submit Queue 2017-03-07 08:10:43 -08:00 committed by GitHub
parent 2bdb22751a 0db355a8ca
commit 74c60fbd71
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/node/controller_utils.go
View File

@ -85,7 +85,7 @@ func deletePods(kubeClient clientset.Interface, recorder record.EventRecorder, n
continue continue
} }
glog.V(2).Infof("Starting deletion of pod %v", pod.Name) glog.V(2).Infof("Starting deletion of pod %v/%v", pod.Namespace, pod.Name)
recorder.Eventf(&pod, v1.EventTypeNormal, "NodeControllerEviction", "Marking for deletion Pod %s from Node %s", pod.Name, nodeName) recorder.Eventf(&pod, v1.EventTypeNormal, "NodeControllerEviction", "Marking for deletion Pod %s from Node %s", pod.Name, nodeName)
if err := kubeClient.Core().Pods(pod.Namespace).Delete(pod.Name, nil); err != nil { if err := kubeClient.Core().Pods(pod.Namespace).Delete(pod.Name, nil); err != nil {
return false, err return false, err

8
pkg/controller/node/nodecontroller.go
View File

@ -628,7 +628,7 @@ func (nc *NodeController) monitorNodeStatus() error {
if observedReadyCondition.Status == v1.ConditionFalse { if observedReadyCondition.Status == v1.ConditionFalse {
if nc.useTaintBasedEvictions { if nc.useTaintBasedEvictions {
if nc.markNodeForTainting(node) { if nc.markNodeForTainting(node) {
glog.V(2).Infof("Tainting Node %v with NotReady taint on %v", glog.V(2).Infof("Node %v is NotReady as of %v. Adding it to the Taint queue.",
node.Name, node.Name,
decisionTimestamp, decisionTimestamp,
) )
@ -636,7 +636,7 @@ func (nc *NodeController) monitorNodeStatus() error {
} else { } else {
if decisionTimestamp.After(nc.nodeStatusMap[node.Name].readyTransitionTimestamp.Add(nc.podEvictionTimeout)) { if decisionTimestamp.After(nc.nodeStatusMap[node.Name].readyTransitionTimestamp.Add(nc.podEvictionTimeout)) {
if nc.evictPods(node) { if nc.evictPods(node) {
glog.V(2).Infof("Evicting pods on node %s: %v is later than %v + %v", glog.V(2).Infof("Node is NotReady. Adding Pods on Node %s to eviction queue: %v is later than %v + %v",
node.Name, node.Name,
decisionTimestamp, decisionTimestamp,
nc.nodeStatusMap[node.Name].readyTransitionTimestamp, nc.nodeStatusMap[node.Name].readyTransitionTimestamp,
@ -649,7 +649,7 @@ func (nc *NodeController) monitorNodeStatus() error {
if observedReadyCondition.Status == v1.ConditionUnknown { if observedReadyCondition.Status == v1.ConditionUnknown {
if nc.useTaintBasedEvictions { if nc.useTaintBasedEvictions {
if nc.markNodeForTainting(node) { if nc.markNodeForTainting(node) {
glog.V(2).Infof("Tainting Node %v with NotReady taint on %v", glog.V(2).Infof("Node %v is unresponsive as of %v. Adding it to the Taint queue.",
node.Name, node.Name,
decisionTimestamp, decisionTimestamp,
) )
@ -657,7 +657,7 @@ func (nc *NodeController) monitorNodeStatus() error {
} else { } else {
if decisionTimestamp.After(nc.nodeStatusMap[node.Name].probeTimestamp.Add(nc.podEvictionTimeout)) { if decisionTimestamp.After(nc.nodeStatusMap[node.Name].probeTimestamp.Add(nc.podEvictionTimeout)) {
if nc.evictPods(node) { if nc.evictPods(node) {
glog.V(2).Infof("Evicting pods on node %s: %v is later than %v + %v", glog.V(2).Infof("Node is unresponsive. Adding Pods on Node %s to eviction queues: %v is later than %v + %v",
node.Name, node.Name,
decisionTimestamp, decisionTimestamp,
nc.nodeStatusMap[node.Name].readyTransitionTimestamp, nc.nodeStatusMap[node.Name].readyTransitionTimestamp,