mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-13 14:57:40 -08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix race condition on file SD (#3468)

Browse source 
The file discovery should only stop the watcher if it has been created
otherwise it may trigger a segmentation fault.
This commit is contained in:
pasquier-s 2017-12-21 11:07:43 +01:00 committed by Brian Brazil
parent 2881d73ed8
commit 78625f85a7
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
discovery/file/file.go
View file

@ -114,14 +114,13 @@ func (d *Discovery) watchFiles() {
// Run implements the TargetProvider interface. // Run implements the TargetProvider interface.
func (d *Discovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) { func (d *Discovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) {
defer d.stop()
watcher, err := fsnotify.NewWatcher() watcher, err := fsnotify.NewWatcher()
if err != nil { if err != nil {
level.Error(d.logger).Log("msg", "Error adding file watcher", "err", err) level.Error(d.logger).Log("msg", "Error adding file watcher", "err", err)
return return
} }
d.watcher = watcher d.watcher = watcher
defer d.stop()
d.refresh(ctx, ch) d.refresh(ctx, ch)