github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Set timeout when collecting metrics from shim's Stat

Browse Source 
Signed-off-by: Nguyen Phan Huy <phanhuy1502@gmail.com>
This commit is contained in:
Nguyen Phan Huy 2022-04-06 16:35:54 +08:00 committed by Nguyen Phan Huy
parent eaf286224b
commit c525aa5f85
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
metrics/cgroups/v1/metrics.go
View File

@ -26,9 +26,11 @@ import (
"github.com/containerd/cgroups"
"github.com/containerd/containerd/log"
cmetrics "github.com/containerd/containerd/metrics"
"github.com/containerd/containerd/metrics/cgroups/common"
v1 "github.com/containerd/containerd/metrics/types/v1"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/timeout"
"github.com/containerd/typeurl"
"github.com/docker/go-metrics"
"github.com/prometheus/client_golang/prometheus"
@ -136,13 +138,17 @@ func (c *Collector) collect(entry entry, ch chan<- prometheus.Metric, block bool
if wg != nil {
defer wg.Done()
}
t := entry.task
ctx := namespaces.WithNamespace(context.Background(), t.Namespace())
stats, err := t.Stats(ctx)
ctx, cancel := timeout.WithContext(context.Background(), cmetrics.ShimStatsRequestTimeout)
stats, err := t.Stats(namespaces.WithNamespace(ctx, t.Namespace()))
cancel()
if err != nil {
log.L.WithError(err).Errorf("stat task %s", t.ID())
return
}
data, err := typeurl.UnmarshalAny(stats)
if err != nil {
log.L.WithError(err).Errorf("unmarshal stats for %s", t.ID())

10
metrics/cgroups/v2/metrics.go
View File

@ -25,9 +25,11 @@ import (
"sync"
"github.com/containerd/containerd/log"
cmetrics "github.com/containerd/containerd/metrics"
"github.com/containerd/containerd/metrics/cgroups/common"
v2 "github.com/containerd/containerd/metrics/types/v2"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/timeout"
"github.com/containerd/typeurl"
"github.com/docker/go-metrics"
"github.com/prometheus/client_golang/prometheus"
@ -129,13 +131,17 @@ func (c *Collector) collect(entry entry, ch chan<- prometheus.Metric, block bool
if wg != nil {
defer wg.Done()
}
t := entry.task
ctx := namespaces.WithNamespace(context.Background(), t.Namespace())
stats, err := t.Stats(ctx)
ctx, cancel := timeout.WithContext(context.Background(), cmetrics.ShimStatsRequestTimeout)
stats, err := t.Stats(namespaces.WithNamespace(ctx, t.Namespace()))
cancel()
if err != nil {
log.L.WithError(err).Errorf("stat task %s", t.ID())
return
}
data, err := typeurl.UnmarshalAny(stats)
if err != nil {
log.L.WithError(err).Errorf("unmarshal stats for %s", t.ID())

8
metrics/metrics.go
View File

@ -17,13 +17,21 @@
package metrics
import (
"time"
"github.com/containerd/containerd/pkg/timeout"
"github.com/containerd/containerd/version"
goMetrics "github.com/docker/go-metrics"
)
const (
ShimStatsRequestTimeout = "io.containerd.timeout.metrics.shimstats"
)
func init() {
ns := goMetrics.NewNamespace("containerd", "", nil)
c := ns.NewLabeledCounter("build_info", "containerd build information", "version", "revision")
c.WithValues(version.Version, version.Revision).Inc()
goMetrics.Register(ns)
timeout.Set(ShimStatsRequestTimeout, 2*time.Second)
}