mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

more comments for the future ME, and reverted the Discovery manager execution changes as these were correct in the first place

Browse source
This commit is contained in:
Krasi Georgiev 2018-01-12 21:45:47 +00:00
parent 78ba5e62a6
commit febebcd49a
2 changed files with 4 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
discovery/manager.go
View file

@ -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. // 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. // Targets sent to the channel are grouped by the target set name.
// When a given target set doesn't include any targets the manager doesn't send any updates for this target set.
type Manager struct { type Manager struct {
logger log.Logger logger log.Logger
actionCh chan func(context.Context) actionCh chan func(context.Context)
@ -181,18 +180,10 @@ func (m *Manager) allGroups() map[string][]*targetgroup.Group {
m.actionCh <- func(ctx context.Context) { m.actionCh <- func(ctx context.Context) {
tSetsAll := map[string][]*targetgroup.Group{} tSetsAll := map[string][]*targetgroup.Group{}
for pkey, tsets := range m.targets { for pkey, tsets := range m.targets {
del := true
for _, tg := range tsets { for _, tg := range tsets {
// Don't add a target set if the target group has no targets. // Even if the target group 'tg' is empty we still need to send it to the 'Scrape manager'
// This happens when a Discoverer sends an empty targets array for a group to indicate that these targets have been removed. // to singal that is needs to stop all scrape loops for this target set.
if len(tg.Targets) != 0 {
tSetsAll[pkey.setName] = append(tSetsAll[pkey.setName], tg) 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)
} }
} }
tSets <- tSetsAll tSets <- tSetsAll

51
discovery/manager_test.go
View file

@ -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 { for testIndex, testCase := range testCases {