feat: Improve ResourceManager UX

.circleci/main.yml

@@ -32,7 +32,6 @@ default_environment: &default_environment
   CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
   CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
   GIT_PAGER: cat
-  IPFS_CHECK_RCMGR_DEFAULTS: 1
 
 executors:
   golang:

config/swarm.go

@@ -143,6 +143,10 @@ type ResourceMgr struct {
 	// Enables the Network Resource Manager feature, default to on.
 	Enabled Flag               `json:",omitempty"`
 	Limits  *rcmgr.LimitConfig `json:",omitempty"`
+
+	MaxMemory          OptionalString  `json:",omitempty"`
+	MaxFileDescriptors OptionalInteger `json:",omitempty"`
+
 	// A list of multiaddrs that can bypass normal system limits (but are still
 	// limited by the allowlist scope). Convenience config around
 	// https://pkg.go.dev/github.com/libp2p/go-libp2p/p2p/host/resource-manager#Allowlist.Add

core/commands/swarm.go

@@ -63,11 +63,12 @@ ipfs peers in the internet.
 }
 
 const (
-	swarmVerboseOptionName     = "verbose"
-	swarmStreamsOptionName     = "streams"
-	swarmLatencyOptionName     = "latency"
-	swarmDirectionOptionName   = "direction"
-	swarmResetLimitsOptionName = "reset"
+	swarmVerboseOptionName           = "verbose"
+	swarmStreamsOptionName           = "streams"
+	swarmLatencyOptionName           = "latency"
+	swarmDirectionOptionName         = "direction"
+	swarmResetLimitsOptionName       = "reset"
+	swarmUsedResourcesPercentageName = "min-used-limit-perc"
 )
 
 type peeringResult struct {
@@ -340,6 +341,9 @@ The output of this command is JSON.
 	Arguments: []cmds.Argument{
 		cmds.StringArg("scope", true, false, "scope of the stat report"),
 	},
+	Options: []cmds.Option{
+		cmds.IntOption(swarmUsedResourcesPercentageName, "Display only resources that are using above the specified percentage"),
+	},
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
 		node, err := cmdenv.GetNode(env)
 		if err != nil {
@@ -353,8 +357,10 @@ The output of this command is JSON.
 		if len(req.Arguments) != 1 {
 			return fmt.Errorf("must specify exactly one scope")
 		}
+
+		percentage, _ := req.Options[swarmUsedResourcesPercentageName].(int)
 		scope := req.Arguments[0]
-		result, err := libp2p.NetStat(node.ResourceManager, scope)
+		result, err := libp2p.NetStat(node.ResourceManager, scope, percentage)
 		if err != nil {
 			return err
 		}
@@ -378,6 +384,7 @@ var swarmLimitCmd = &cmds.Command{
 		Tagline: "Get or set resource limits for a scope.",
 		LongDescription: `Get or set resource limits for a scope.
 The scope can be one of the following:
+- all           -- all limits actually being applied.
 - system        -- limits for the system aggregate resource usage.
 - transient     -- limits for the transient resource usage.
 - svc:<service> -- limits for the resource usage of a specific service.
@@ -435,19 +442,19 @@ Changes made via command line are persisted in the Swarm.ResourceMgr.Limits fiel
 			}
 		}
 
-		var result rcmgr.BaseLimit
+		var result interface{}
 		_, reset := req.Options[swarmResetLimitsOptionName]
 		if reset {
 			result, err = libp2p.NetResetLimit(node.ResourceManager, node.Repo, scope)
-			if err != nil {
-				return err
-			}
+		} else if scope == "all" {
+			result, err = libp2p.NetLimitAll(node.ResourceManager)
 		} else {
 			// get scope limit
 			result, err = libp2p.NetLimit(node.ResourceManager, scope)
-			if err != nil {
-				return err
-			}
+		}
+
+		if err != nil {
+			return err
 		}
 
 		b := new(bytes.Buffer)

core/node/libp2p/fd/sys_not_unix.go

@@ -0,0 +1,7 @@
+//go:build !linux && !darwin && !windows
+
+package fd
+
+func GetNumFDs() int {
+	return 0
+}

core/node/libp2p/fd/sys_unix.go

@@ -0,0 +1,16 @@
+//go:build linux || darwin
+// +build linux darwin
+
+package fd
+
+import (
+	"golang.org/x/sys/unix"
+)
+
+func GetNumFDs() int {
+	var l unix.Rlimit
+	if err := unix.Getrlimit(unix.RLIMIT_NOFILE, &l); err != nil {
+		return 0
+	}
+	return int(l.Cur)
+}

core/node/libp2p/fd/sys_windows.go

@@ -0,0 +1,11 @@
+//go:build windows
+
+package fd
+
+import (
+	"math"
+)
+
+func GetNumFDs() int {
+	return math.MaxInt
+}