WIP: Implement new ResourceManager partial limits config object

Signed-off-by: Antonio Navarro Perez <[email protected]>
ipfs · Jan 31, 2023 · 88b45fd · 88b45fd
1 parent 3fb644a
commit 88b45fd
Show file tree

Hide file tree

Showing 7 changed files with 190 additions and 241 deletions.
diff --git a/config/swarm.go b/config/swarm.go
@@ -141,8 +141,8 @@ type ConnMgr struct {
 // <https://github.com/libp2p/go-libp2p/tree/master/p2p/host/resource-manager#readme>
 type ResourceMgr struct {
 	// Enables the Network Resource Manager feature, default to on.
-	Enabled Flag               `json:",omitempty"`
-	Limits  *rcmgr.LimitConfig `json:",omitempty"`
+	Enabled Flag                      `json:",omitempty"`
+	Limits  *rcmgr.PartialLimitConfig `json:",omitempty"`
 
 	MaxMemory          *OptionalString  `json:",omitempty"`
 	MaxFileDescriptors *OptionalInteger `json:",omitempty"`

diff --git a/core/commands/swarm.go b/core/commands/swarm.go
@@ -430,7 +430,7 @@ Changes made via command line are persisted in the Swarm.ResourceMgr.Limits fiel
 
 		//  set scope limit to new values (when limit.json is passed as a second arg)
 		if req.Files != nil {
-			var newLimit rcmgr.BaseLimit
+			var newLimit *rcmgr.ResourceLimits
 			it := req.Files.Entries()
 			if it.Next() {
 				file := files.FileFromEntry(it)