From febebcd49ac6e5ba75007ec24a024dcad67f80c3 Mon Sep 17 00:00:00 2001
From: Krasi Georgiev <krasi.root@gmail.com>
Date: Fri, 12 Jan 2018 21:45:47 +0000
Subject: [PATCH] more comments for the future ME, and reverted the Discovery
 manager execution changes as these were correct in the first place

---
 discovery/manager.go      | 17 +++----------
 discovery/manager_test.go | 51 ---------------------------------------
 2 files changed, 4 insertions(+), 64 deletions(-)

diff --git a/discovery/manager.go b/discovery/manager.go
index 5bf8b26fa8..427a35251c 100644
--- a/discovery/manager.go
+++ b/discovery/manager.go
@@ -70,8 +70,7 @@ func NewManager(logger log.Logger) *Manager {
 }
 
 // Manager maintains a set of discovery providers and sends each update to a channel used by other packages.
-// Targets are grouped by target set names.
-// When a given target set doesn't include any targets the manager doesn't send any updates for this target set.
+// Targets sent to the channel are grouped by the target set name.
 type Manager struct {
 	logger         log.Logger
 	actionCh       chan func(context.Context)
@@ -181,18 +180,10 @@ func (m *Manager) allGroups() map[string][]*targetgroup.Group {
 	m.actionCh <- func(ctx context.Context) {
 		tSetsAll := map[string][]*targetgroup.Group{}
 		for pkey, tsets := range m.targets {
-			del := true
 			for _, tg := range tsets {
-				// Don't add a target set if the target group has no targets.
-				// This happens when a Discoverer sends an empty targets array for a group to indicate that these targets have been removed.
-				if len(tg.Targets) != 0 {
-					tSetsAll[pkey.setName] = append(tSetsAll[pkey.setName], tg)
-					del = false
-				}
-			}
-			// Delete the empty map for this target set to avoid memory leaks.
-			if del {
-				delete(m.targets, pkey)
+				// Even if the target group 'tg' is empty we still need to send it to the 'Scrape manager'
+				// to singal that is needs to stop all scrape loops for this target set.
+				tSetsAll[pkey.setName] = append(tSetsAll[pkey.setName], tg)
 			}
 		}
 		tSets <- tSetsAll
diff --git a/discovery/manager_test.go b/discovery/manager_test.go
index b7ea2457f7..f3ecf784eb 100644
--- a/discovery/manager_test.go
+++ b/discovery/manager_test.go
@@ -649,57 +649,6 @@ func TestDiscoveryManagerSyncCalls(t *testing.T) {
 				},
 			},
 		},
-		{
-			title: "Single TP update with an empty group to check for memory leaks",
-			updates: map[string][]update{
-				"tp1": {
-					{
-						targetGroups: []targetgroup.Group{
-							{
-								Source:  "tp1_group1",
-								Targets: []model.LabelSet{{"__instance__": "1"}},
-							},
-							{
-								Source:  "tp1_group2",
-								Targets: []model.LabelSet{{"__instance__": "2"}},
-							},
-						},
-						interval: 30,
-					},
-					{
-						targetGroups: []targetgroup.Group{
-							{
-								Source:  "tp1_group1",
-								Targets: []model.LabelSet{{"__instance__": "3"}},
-							},
-							{
-								Source:  "tp1_group2",
-								Targets: nil,
-							},
-						},
-						interval: 10,
-					},
-				},
-			},
-			expectedTargets: [][]*targetgroup.Group{
-				{
-					{
-						Source:  "tp1_group1",
-						Targets: []model.LabelSet{{"__instance__": "1"}},
-					},
-					{
-						Source:  "tp1_group2",
-						Targets: []model.LabelSet{{"__instance__": "2"}},
-					},
-				},
-				{
-					{
-						Source:  "tp1_group1",
-						Targets: []model.LabelSet{{"__instance__": "3"}},
-					},
-				},
-			},
-		},
 	}
 
 	for testIndex, testCase := range testCases {