reduce inotify watch

google · Jul 22, 2023 · dcb1803 · dcb1803
1 parent 248756c
commit dcb1803
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/container/raw/watcher.go b/container/raw/watcher.go
@@ -18,6 +18,7 @@ package raw
 
 import (
 	"fmt"
+	"github.com/google/cadvisor/container"
 	"os"
 	"path"
 	"strings"
@@ -27,8 +28,6 @@ import (
 	"github.com/google/cadvisor/container/common"
 	"github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/watcher"
-
-	"k8s.io/klog/v2"
 )
 
 type rawContainerWatcher struct {
@@ -42,8 +41,8 @@ type rawContainerWatcher struct {
 	stopWatcher chan error
 }
 
-func NewRawContainerWatcher() (watcher.ContainerWatcher, error) {
-	cgroupSubsystems, err := libcontainer.GetCgroupSubsystems(nil)
+func NewRawContainerWatcher(includedMetrics container.MetricSet) (watcher.ContainerWatcher, error) {
+	cgroupSubsystems, err := libcontainer.GetCgroupSubsystems(includedMetrics)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get cgroup subsystems: %v", err)
 	}

diff --git a/manager/manager.go b/manager/manager.go
@@ -295,7 +295,7 @@ func (m *manager) Start() error {
 		klog.Errorf("Registration of the raw container factory failed: %v", err)
 	}
 
-	rawWatcher, err := raw.NewRawContainerWatcher()
+	rawWatcher, err := raw.NewRawContainerWatcher(m.includedMetrics)
 	if err != nil {
 		return err
 	}