Merge pull request #1780 from prometheus/fabxc-k8s-locks

discovery/kubernetes: add missing locking
This commit is contained in:
Fabian Reinartz 2016-07-01 17:10:09 +02:00 committed by GitHub
commit b3f321b38a

View file

@ -408,7 +408,9 @@ func (kd *Discovery) watchNodes(events chan interface{}, done <-chan struct{}, r
}
// Reset the known nodes.
kd.nodesMu.Lock()
kd.nodes = map[string]*Node{}
kd.nodesMu.Unlock()
for _, node := range nodes {
events <- &nodeEvent{Added, node}
@ -459,7 +461,9 @@ func (kd *Discovery) startServiceWatch(events chan<- interface{}, done <-chan st
existingServices := kd.services
// Reset the known services.
kd.servicesMu.Lock()
kd.services = map[string]map[string]*Service{}
kd.servicesMu.Unlock()
services, resourceVersion, err := kd.getServices()
if err != nil {