github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

pkg/controller/node/nodecontroller: simplify mutex

Browse Source 
Similar to #29598, we can rely on the zero-value construction behavior
to embed `sync.Mutex` into parent structs.
This commit is contained in:
Matt T. Proud 2016-07-26 07:06:16 +02:00
parent ed3a29bd6a
commit 76aab29ede
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ type NodeController struct {
nodeStatusMap map[string]nodeStatusData nodeStatusMap map[string]nodeStatusData
now func() unversioned.Time now func() unversioned.Time
// Lock to access evictor workers // Lock to access evictor workers
evictorLock *sync.Mutex evictorLock sync.Mutex
// workers that evicts pods from unresponsive nodes. // workers that evicts pods from unresponsive nodes.
zonePodEvictor map[string]*RateLimitedTimedQueue zonePodEvictor map[string]*RateLimitedTimedQueue
zoneTerminationEvictor map[string]*RateLimitedTimedQueue zoneTerminationEvictor map[string]*RateLimitedTimedQueue
@ -181,7 +181,6 @@ func NewNodeController(
glog.Fatal("NodeController: Invalid clusterCIDR, mask size of clusterCIDR must be less than nodeCIDRMaskSize.") glog.Fatal("NodeController: Invalid clusterCIDR, mask size of clusterCIDR must be less than nodeCIDRMaskSize.")
} }
} }
evictorLock := sync.Mutex{}
nc := &NodeController{ nc := &NodeController{
cloud: cloud, cloud: cloud,
@ -190,7 +189,6 @@ func NewNodeController(
recorder: recorder, recorder: recorder,
podEvictionTimeout: podEvictionTimeout, podEvictionTimeout: podEvictionTimeout,
maximumGracePeriod: 5 * time.Minute, maximumGracePeriod: 5 * time.Minute,
evictorLock: &evictorLock,
zonePodEvictor: make(map[string]*RateLimitedTimedQueue), zonePodEvictor: make(map[string]*RateLimitedTimedQueue),
zoneTerminationEvictor: make(map[string]*RateLimitedTimedQueue), zoneTerminationEvictor: make(map[string]*RateLimitedTimedQueue),
nodeStatusMap: make(map[string]nodeStatusData), nodeStatusMap: make(map[string]nodeStatusData),