Merge pull request #29969 from ZTE-PaaS/zhangke-patch-015

Automatic merge from submit-queue remove duplicate code in updatePodCIDR As kl.runtimeState.podCIDR() is a sync method, need fetch lock and release lock, so we only invoke once here

Merge pull request #29969 from ZTE-PaaS/zhangke-patch-015
d9533c95 · Kubernetes Submit Queue · GitHub · 0babf0ed · 2b654d12 · d9533c95
Commit d9533c95 authored Aug 22, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

kubelet_network.go pkg/kubelet/kubelet_network.go +4 -2

No files found.
--- a/pkg/kubelet/kubelet_network.go
+++ b/pkg/kubelet/kubelet_network.go
@@ -297,11 +297,13 @@ func (kl *Kubelet) syncNetworkStatus() {
 // updatePodCIDR updates the pod CIDR in the runtime state if it is different
 // from the current CIDR.
 func (kl *Kubelet) updatePodCIDR(cidr string) {
-	if kl.runtimeState.podCIDR() == cidr {
+	podCIDR := kl.runtimeState.podCIDR()
+
+	if podCIDR == cidr {
 		return
 	}

-	glog.Infof("Setting Pod CIDR: %v -> %v", kl.runtimeState.podCIDR(), cidr)
+	glog.Infof("Setting Pod CIDR: %v -> %v", podCIDR, cidr)
 	kl.runtimeState.setPodCIDR(cidr)

 	if kl.networkPlugin != nil {