From 4bdd8fcff442ac4f1906513076847c5ad84eff19 Mon Sep 17 00:00:00 2001 From: benji2k2 Date: Wed, 17 Dec 2025 13:00:56 +0100 Subject: [PATCH 1/6] Fix for issue #3772 Only initialize containderd for docker if StorageDriver is ContainerdSnapshotterStorageDriver --- container/docker/factory.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/container/docker/factory.go b/container/docker/factory.go index fec0ea5063..a529c232d6 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -352,9 +352,11 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics } } - containerdClient, err := containerd.Client(*containerd.ArgContainerdEndpoint, "moby") - if err != nil { - return fmt.Errorf("unable to create containerd client: %v", err) + if StorageDriver(dockerInfo.Driver) == ContainerdSnapshotterStorageDriver { + containerdClient, err := containerd.Client(*containerd.ArgContainerdEndpoint, "moby") + if err != nil { + return fmt.Errorf("unable to create containerd client: %v", err) + } } klog.V(1).Infof("Registering Docker factory") From 3ff471070c838a5c1ee5682a458dbcb0ad2918fb Mon Sep 17 00:00:00 2001 From: benji2k2 Date: Wed, 17 Dec 2025 16:19:59 +0100 Subject: [PATCH 2/6] Update factory.go Declared Variable --- container/docker/factory.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/container/docker/factory.go b/container/docker/factory.go index a529c232d6..d65af5bd4a 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -351,7 +351,10 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics } } } - + + var ( + containerdClient *containerd.ContainerdClient + ) if StorageDriver(dockerInfo.Driver) == ContainerdSnapshotterStorageDriver { containerdClient, err := containerd.Client(*containerd.ArgContainerdEndpoint, "moby") if err != nil { From f8fd93113ab82331e5026432f17280e924f98c4e Mon Sep 17 00:00:00 2001 From: benji2k2 Date: Wed, 17 Dec 2025 16:48:49 +0100 Subject: [PATCH 3/6] Update factory.go moved Variable containerdClient to other variables --- container/docker/factory.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/container/docker/factory.go b/container/docker/factory.go index d65af5bd4a..e247bc8121 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -331,6 +331,7 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics thinPoolWatcher *devicemapper.ThinPoolWatcher thinPoolName string zfsWatcher *zfs.ZfsWatcher + containerdClient *containerd.ContainerdClient ) if includedMetrics.Has(container.DiskUsageMetrics) { if StorageDriver(dockerInfo.Driver) == DevicemapperStorageDriver { @@ -352,9 +353,6 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics } } - var ( - containerdClient *containerd.ContainerdClient - ) if StorageDriver(dockerInfo.Driver) == ContainerdSnapshotterStorageDriver { containerdClient, err := containerd.Client(*containerd.ArgContainerdEndpoint, "moby") if err != nil { From 86cecde49a9bc429b3f6017f7da78e0efa370aea Mon Sep 17 00:00:00 2001 From: benji2k2 Date: Wed, 17 Dec 2025 17:26:26 +0100 Subject: [PATCH 4/6] Update factory.go Changes type (no pointer) --- container/docker/factory.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/container/docker/factory.go b/container/docker/factory.go index e247bc8121..2e578bcfc7 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -328,10 +328,10 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics } var ( - thinPoolWatcher *devicemapper.ThinPoolWatcher - thinPoolName string - zfsWatcher *zfs.ZfsWatcher - containerdClient *containerd.ContainerdClient + thinPoolWatcher *devicemapper.ThinPoolWatcher + thinPoolName string + zfsWatcher *zfs.ZfsWatcher + containerdClient containerd.ContainerdClient ) if includedMetrics.Has(container.DiskUsageMetrics) { if StorageDriver(dockerInfo.Driver) == DevicemapperStorageDriver { From 589c4c8fed03537e1802717315d59dfb3057b4a0 Mon Sep 17 00:00:00 2001 From: benji2k2 Date: Thu, 18 Dec 2025 10:52:16 +0100 Subject: [PATCH 5/6] Update container/docker/factory.go Correct assignment of variable containerdClient Co-authored-by: Sambhav Jain <67923444+sambhav-jain-16@users.noreply.github.com> --- container/docker/factory.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/docker/factory.go b/container/docker/factory.go index 2e578bcfc7..b903f5da1b 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -354,7 +354,7 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics } if StorageDriver(dockerInfo.Driver) == ContainerdSnapshotterStorageDriver { - containerdClient, err := containerd.Client(*containerd.ArgContainerdEndpoint, "moby") + containerdClient, err = containerd.Client(*containerd.ArgContainerdEndpoint, "moby") if err != nil { return fmt.Errorf("unable to create containerd client: %v", err) } From 0ae9dc96b0cdfe6699b9205cd65b503d8411d31c Mon Sep 17 00:00:00 2001 From: Sambhav Jain Date: Fri, 19 Dec 2025 12:36:22 +0000 Subject: [PATCH 6/6] fix formatting --- container/docker/factory.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/docker/factory.go b/container/docker/factory.go index b903f5da1b..1869c37004 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -352,7 +352,7 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics } } } - + if StorageDriver(dockerInfo.Driver) == ContainerdSnapshotterStorageDriver { containerdClient, err = containerd.Client(*containerd.ArgContainerdEndpoint, "moby") if err != nil {