Merge pull request moby#49210 from thaJeztah/internalize_fd_count

pkg/fileutils: move GetTotalUsedFds internal in daemon

.golangci.yml

@@ -151,10 +151,6 @@ issues:
       path: "api/types/(volume|container)/"
       linters:
         - revive
-    # FIXME temporarily suppress these until we migrated these to internal.
-    - text: "SA1019: fileutils\\.GetTotalUsedFds"
-      linters:
-        - staticcheck
     # FIXME temporarily suppress these (see https://github.com/gotestyourself/gotest.tools/issues/272)
     - text: "SA1019: (assert|cmp|is)\\.ErrorType is deprecated"
       linters:

daemon/info.go

@@ -19,10 +19,10 @@ import (
 	"github.com/docker/docker/api/types/system"
 	"github.com/docker/docker/cmd/dockerd/debug"
 	"github.com/docker/docker/daemon/config"
+	"github.com/docker/docker/daemon/internal/filedescriptors"
 	"github.com/docker/docker/daemon/logger"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/internal/platform"
-	"github.com/docker/docker/pkg/fileutils"
 	"github.com/docker/docker/pkg/meminfo"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/parsers/operatingsystem"
@@ -225,7 +225,7 @@ func (daemon *Daemon) fillContainerStates(v *system.Info) {
 // https://github.com/docker/cli/blob/v20.10.12/cli/command/system/info.go#L239-L244
 func (daemon *Daemon) fillDebugInfo(ctx context.Context, v *system.Info) {
 	v.Debug = debug.IsEnabled()
-	v.NFd = fileutils.GetTotalUsedFds(ctx)
+	v.NFd = filedescriptors.GetTotalUsedFds(ctx)
 	v.NGoroutines = runtime.NumGoroutine()
 	v.NEventsListener = daemon.EventsService.SubscribersCount()
 }

pkg/fileutils/fileutils_linux.go → daemon/internal/filedescriptors/filiedescriptors_linux.go

@@ -1,4 +1,4 @@
-package fileutils
+package filedescriptors
 
 import (
 	"context"
@@ -13,8 +13,6 @@ import (
 
 // GetTotalUsedFds Returns the number of used File Descriptors by
 // reading it via /proc filesystem.
-//
-// Deprecated: this function is only used internally, and will be removed in the next release.
 func GetTotalUsedFds(ctx context.Context) int {
 	ctx, span := tracing.StartSpan(ctx, "GetTotalUsedFds")
 	defer span.End()

daemon/internal/filedescriptors/filiedescriptors_linux_test.go

@@ -0,0 +1,14 @@
+package filedescriptors
+
+import (
+	"context"
+	"testing"
+)
+
+func BenchmarkGetTotalUsedFds(b *testing.B) {
+	ctx := context.Background()
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		_ = GetTotalUsedFds(ctx)
+	}
+}

daemon/internal/filedescriptors/filiedescriptors_unsupported.go

@@ -0,0 +1,11 @@
+//go:build !linux
+
+package filedescriptors
+
+import "context"
+
+// GetTotalUsedFds Returns the number of used File Descriptors. Not supported
+// on Windows.
+func GetTotalUsedFds(context.Context) int {
+	return -1
+}

pkg/fileutils/fileutils_test.go

@@ -1,7 +1,6 @@
 package fileutils // import "github.com/docker/docker/pkg/fileutils"
 
 import (
-	"context"
 	"errors"
 	"os"
 	"path"
@@ -241,11 +240,3 @@ func TestCreateIfNotExistsFile(t *testing.T) {
 		t.Errorf("Should have been a file, seems it's not")
 	}
 }
-
-func BenchmarkGetTotalUsedFds(b *testing.B) {
-	ctx := context.Background()
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		_ = GetTotalUsedFds(ctx)
-	}
-}