mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 22:49:40 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #1148 from prometheus/fix-serverset-multiple-paths

Browse source 
Fix watching multiple Zookeeper paths in serverset SD.
This commit is contained in:
Julius Volz 2015-10-08 19:27:06 +02:00
parent 9cba38c6da 60cf4015a4
commit dec9fc9c32
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
retrieval/discovery/serverset.go
View file

@ -63,13 +63,13 @@ func (zl zookeeperLogger) Printf(s string, i ...interface{}) {
// ServersetDiscovery retrieves target information from a Serverset server // ServersetDiscovery retrieves target information from a Serverset server
// and updates them via watches. // and updates them via watches.
type ServersetDiscovery struct { type ServersetDiscovery struct {
conf *config.ServersetSDConfig conf *config.ServersetSDConfig
conn *zk.Conn conn *zk.Conn
mu sync.RWMutex mu sync.RWMutex
sources map[string]*config.TargetGroup sources map[string]*config.TargetGroup
sdUpdates *chan<- *config.TargetGroup sdUpdates *chan<- *config.TargetGroup
updates chan zookeeperTreeCacheEvent updates chan zookeeperTreeCacheEvent
treeCache *zookeeperTreeCache treeCaches []*zookeeperTreeCache
} }
// NewServersetDiscovery returns a new ServersetDiscovery for the given config. // NewServersetDiscovery returns a new ServersetDiscovery for the given config.
@ -87,7 +87,9 @@ func NewServersetDiscovery(conf *config.ServersetSDConfig) *ServersetDiscovery {
sources: map[string]*config.TargetGroup{}, sources: map[string]*config.TargetGroup{},
} }
go sd.processUpdates() go sd.processUpdates()
sd.treeCache = newZookeeperTreeCache(conn, conf.Paths[0], updates) for _, path := range conf.Paths {
sd.treeCaches = append(sd.treeCaches, newZookeeperTreeCache(conn, path, updates))
}
return sd return sd
} }
@ -143,7 +145,9 @@ func (sd *ServersetDiscovery) Run(ch chan<- *config.TargetGroup, done <-chan str
sd.mu.Unlock() sd.mu.Unlock()
<-done <-done
sd.treeCache.Stop() for _, tc := range sd.treeCaches {
tc.Stop()
}
} }
func parseServersetMember(data []byte, path string) (*model.LabelSet, error) { func parseServersetMember(data []byte, path string) (*model.LabelSet, error) {