Merge pull request #2727 from mikebrow/ignore-idempotence

dmcgowan · web-flow · commit 405518591d1d · 2018-10-18T11:16:41.000-07:00
allow idempotence when adding a task to cgroup metrics collection
diff --git a/metrics/cgroups/metrics.go b/metrics/cgroups/metrics.go
@@ -20,7 +20,6 @@ package cgroups
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"sync"
 
@@ -33,13 +32,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-var (
-	// ErrAlreadyCollected is returned when a cgroups is already being monitored
-	ErrAlreadyCollected = errors.New("cgroup is already being collected")
-	// ErrCgroupNotExists is returns when a cgroup no longer exists
-	ErrCgroupNotExists = errors.New("cgroup does not exist in the collector")
-)
-
 // Trigger will be called when an event happens and provides the cgroup
 // where the event originated from
 type Trigger func(string, string, cgroups.Cgroup)
@@ -141,7 +133,7 @@ func (c *collector) Add(t runtime.Task) error {
 	defer c.mu.Unlock()
 	id := taskID(t.ID(), t.Namespace())
 	if _, ok := c.tasks[id]; ok {
-		return ErrAlreadyCollected
+		return nil // requests to collect metrics should be idempotent
 	}
 	c.tasks[id] = t
 	return nil
