From acc4197098bedf962504c7892ca00bd68f2ec424 Mon Sep 17 00:00:00 2001
From: Krasi Georgiev <krasi.root@gmail.com>
Date: Fri, 26 Jan 2018 00:32:36 +0100
Subject: [PATCH 1/2] remove dicovery race for the  context field

---
 cmd/prometheus/main.go | 27 +++++++++++++++------------
 discovery/manager.go   | 11 +++++------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
index a38ceec1e..2939a7403 100644
--- a/cmd/prometheus/main.go
+++ b/cmd/prometheus/main.go
@@ -238,12 +238,17 @@ func main() {
 		ctxWeb, cancelWeb = context.WithCancel(context.Background())
 		ctxRule           = context.Background()
 
-		notifier               = notifier.New(&cfg.notifier, log.With(logger, "component", "notifier"))
-		discoveryManagerScrape = discovery.NewManager(log.With(logger, "component", "discovery manager scrape"))
-		discoveryManagerNotify = discovery.NewManager(log.With(logger, "component", "discovery manager notify"))
-		scrapeManager          = retrieval.NewScrapeManager(log.With(logger, "component", "scrape manager"), fanoutStorage)
-		queryEngine            = promql.NewEngine(fanoutStorage, &cfg.queryEngine)
-		ruleManager            = rules.NewManager(&rules.ManagerOptions{
+		notifier = notifier.New(&cfg.notifier, log.With(logger, "component", "notifier"))
+
+		ctxScrape, cancelScrape = context.WithCancel(context.Background())
+		discoveryManagerScrape  = discovery.NewManager(ctxScrape, log.With(logger, "component", "discovery manager scrape"))
+
+		ctxNotify, cancelNotify = context.WithCancel(context.Background())
+		discoveryManagerNotify  = discovery.NewManager(ctxNotify, log.With(logger, "component", "discovery manager notify"))
+
+		scrapeManager = retrieval.NewScrapeManager(log.With(logger, "component", "scrape manager"), fanoutStorage)
+		queryEngine   = promql.NewEngine(fanoutStorage, &cfg.queryEngine)
+		ruleManager   = rules.NewManager(&rules.ManagerOptions{
 			Appendable:  fanoutStorage,
 			QueryFunc:   rules.EngineQueryFunc(queryEngine),
 			NotifyFunc:  sendAlerts(notifier, cfg.web.ExternalURL.String()),
@@ -375,30 +380,28 @@ func main() {
 		)
 	}
 	{
-		ctx, cancel := context.WithCancel(context.Background())
 		g.Add(
 			func() error {
-				err := discoveryManagerScrape.Run(ctx)
+				err := discoveryManagerScrape.Run()
 				level.Info(logger).Log("msg", "Scrape discovery manager stopped")
 				return err
 			},
 			func(err error) {
 				level.Info(logger).Log("msg", "Stopping scrape discovery manager...")
-				cancel()
+				cancelScrape()
 			},
 		)
 	}
 	{
-		ctx, cancel := context.WithCancel(context.Background())
 		g.Add(
 			func() error {
-				err := discoveryManagerNotify.Run(ctx)
+				err := discoveryManagerNotify.Run()
 				level.Info(logger).Log("msg", "Notify discovery manager stopped")
 				return err
 			},
 			func(err error) {
 				level.Info(logger).Log("msg", "Stopping notify discovery manager...")
-				cancel()
+				cancelNotify()
 			},
 		)
 	}
diff --git a/discovery/manager.go b/discovery/manager.go
index c21e32d5a..0b6716048 100644
--- a/discovery/manager.go
+++ b/discovery/manager.go
@@ -60,13 +60,13 @@ type poolKey struct {
 }
 
 // NewManager is the Discovery Manager constructor
-func NewManager(logger log.Logger) *Manager {
+func NewManager(ctx context.Context, logger log.Logger) *Manager {
 	return &Manager{
 		logger:         logger,
 		syncCh:         make(chan map[string][]*targetgroup.Group),
 		targets:        make(map[poolKey]map[string]*targetgroup.Group),
 		discoverCancel: []context.CancelFunc{},
-		ctx:            context.Background(),
+		ctx:            ctx,
 	}
 }
 
@@ -89,13 +89,12 @@ type Manager struct {
 }
 
 // Run starts the background processing
-func (m *Manager) Run(ctx context.Context) error {
-	m.ctx = ctx
+func (m *Manager) Run() error {
 	for {
 		select {
-		case <-ctx.Done():
+		case <-m.ctx.Done():
 			m.cancelDiscoverers()
-			return ctx.Err()
+			return m.ctx.Err()
 		}
 	}
 }

From 818dda72db651031a05f8a19d8122e3b80fae549 Mon Sep 17 00:00:00 2001
From: Krasi Georgiev <krasi.root@gmail.com>
Date: Fri, 26 Jan 2018 13:31:59 +0000
Subject: [PATCH 2/2] updated the sd tests

---
 discovery/manager_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/discovery/manager_test.go b/discovery/manager_test.go
index 2eb86605e..cbfd651b3 100644
--- a/discovery/manager_test.go
+++ b/discovery/manager_test.go
@@ -655,7 +655,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
 	for testIndex, testCase := range testCases {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-		discoveryManager := NewManager(nil)
+		discoveryManager := NewManager(ctx, nil)
 
 		var totalUpdatesCount int
 
@@ -741,8 +741,8 @@ scrape_configs:
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	discoveryManager := NewManager(nil)
-	go discoveryManager.Run(ctx)
+	discoveryManager := NewManager(ctx, nil)
+	go discoveryManager.Run()
 
 	c := make(map[string]sd_config.ServiceDiscoveryConfig)
 	for _, v := range cfg.ScrapeConfigs {