From 879b2ae2915a876a0bc45130ac5b738c340b0a50 Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Wed, 17 Oct 2018 16:55:22 -0500 Subject: [PATCH] allow idempotence when adding a task to cgroup metrics collection Signed-off-by: Mike Brown --- metrics/cgroups/metrics.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/metrics/cgroups/metrics.go b/metrics/cgroups/metrics.go index b0ec56bdd..5856d690e 100644 --- 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