Bump cAdvisor to v0.44.1

Bump cAdvisor to v0.44.1 to pick up fix for containerd task timeout
which resulted in empty network metrics.

Signed-off-by: David Porter <david@porter.me>
This commit is contained in:
David Porter
2022-04-25 17:18:38 -07:00
parent f02682c628
commit b0da29dcb8
5 changed files with 22 additions and 8 deletions

View File

@@ -16,6 +16,7 @@ package containerd
import (
"context"
"errors"
"fmt"
"net"
"sync"
@@ -24,6 +25,7 @@ import (
containersapi "github.com/containerd/containerd/api/services/containers/v1"
tasksapi "github.com/containerd/containerd/api/services/tasks/v1"
versionapi "github.com/containerd/containerd/api/services/version/v1"
tasktypes "github.com/containerd/containerd/api/types/task"
ptypes "github.com/gogo/protobuf/types"
"github.com/google/cadvisor/container/containerd/containers"
"github.com/google/cadvisor/container/containerd/errdefs"
@@ -44,6 +46,10 @@ type ContainerdClient interface {
Version(ctx context.Context) (string, error)
}
var (
ErrTaskIsInUnknownState = errors.New("containerd task is in unknown state") // used when process reported in containerd task is in Unknown State
)
var once sync.Once
var ctrdClient ContainerdClient = nil
@@ -114,6 +120,9 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) {
if err != nil {
return 0, errdefs.FromGRPC(err)
}
if response.Process.Status == tasktypes.StatusUnknown {
return 0, ErrTaskIsInUnknownState
}
return response.Process.Pid, nil
}

View File

@@ -17,6 +17,7 @@ package containerd
import (
"encoding/json"
"errors"
"fmt"
"strings"
"time"
@@ -101,10 +102,14 @@ func newContainerdContainerHandler(
if err == nil {
break
}
retry--
if !errdefs.IsNotFound(err) || retry == 0 {
// Retry when task is not created yet or task is in unknown state (likely in process of initializing)
isRetriableError := errdefs.IsNotFound(err) || errors.Is(err, ErrTaskIsInUnknownState)
if !isRetriableError || retry == 0 {
return nil, err
}
retry--
time.Sleep(backoff)
backoff *= 2
}

4
vendor/modules.txt vendored
View File

@@ -322,7 +322,7 @@ github.com/golang/protobuf/ptypes/timestamp
github.com/golang/protobuf/ptypes/wrappers
# github.com/google/btree v1.0.1 => github.com/google/btree v1.0.1
github.com/google/btree
# github.com/google/cadvisor v0.44.0 => github.com/google/cadvisor v0.44.0
# github.com/google/cadvisor v0.44.1 => github.com/google/cadvisor v0.44.1
## explicit
github.com/google/cadvisor/accelerators
github.com/google/cadvisor/cache/memory
@@ -2545,7 +2545,7 @@ sigs.k8s.io/yaml
# github.com/golang/protobuf => github.com/golang/protobuf v1.5.2
# github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e
# github.com/google/btree => github.com/google/btree v1.0.1
# github.com/google/cadvisor => github.com/google/cadvisor v0.44.0
# github.com/google/cadvisor => github.com/google/cadvisor v0.44.1
# github.com/google/cel-go => github.com/google/cel-go v0.10.1
# github.com/google/cel-spec => github.com/google/cel-spec v0.6.0
# github.com/google/gnostic => github.com/google/gnostic v0.5.7-v3refs