Skip to content

Commit 7d5f2ac

Browse files
author
Ravi Sankar Penta
committed
Avoid NodeNetworkUnavailable condition check for every node status update
- We know that kubelet sets NodeNetworkUnavailable condition when the node is created/registered with api server. - So we only need to call clearInitialNodeNetworkUnavailableCondition() for the first time and not during subsequent node status update events.
1 parent ebda62b commit 7d5f2ac

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

pkg/network/master/subnets.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,15 @@ func (master *OsdnMaster) handleAddOrUpdateNode(obj, _ interface{}, eventType wa
249249
utilruntime.HandleError(fmt.Errorf("Node IP is not set for node %s, skipping %s event, node: %v", node.Name, eventType, node))
250250
return
251251
}
252-
master.clearInitialNodeNetworkUnavailableCondition(node)
253252

254253
if oldNodeIP, ok := master.hostSubnetNodeIPs[node.UID]; ok && (nodeIP == oldNodeIP) {
255254
return
256255
}
257256
// Node status is frequently updated by kubelet, so log only if the above condition is not met
258257
glog.V(5).Infof("Watch %s event for Node %q", eventType, node.Name)
259258

259+
master.clearInitialNodeNetworkUnavailableCondition(node)
260+
260261
usedNodeIP, err := master.addNode(node.Name, string(node.UID), nodeIP, nil)
261262
if err != nil {
262263
utilruntime.HandleError(fmt.Errorf("Error creating subnet for node %s, ip %s: %v", node.Name, nodeIP, err))

0 commit comments

Comments
 (0)