From f1564862086b005fbe449444e1e5274f6d5df593 Mon Sep 17 00:00:00 2001 From: Lucas Molas Date: Wed, 11 May 2022 20:05:52 -0300 Subject: [PATCH 1/2] fix(node/libp2p): disable rcmg checkImplicitDefaults --- core/node/libp2p/rcmgr_defaults.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/node/libp2p/rcmgr_defaults.go b/core/node/libp2p/rcmgr_defaults.go index e5e0cbb346f..11d24364149 100644 --- a/core/node/libp2p/rcmgr_defaults.go +++ b/core/node/libp2p/rcmgr_defaults.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "math/bits" + "os" "strings" config "github.com/ipfs/go-ipfs/config" @@ -19,7 +20,10 @@ import ( // such as values in Swarm.ConnMgr.HiWater config. func adjustedDefaultLimits(cfg config.SwarmConfig) rcmgr.DefaultLimitConfig { // Run checks to avoid introducing regressions - checkImplicitDefaults() + if os.Getenv("IPFS_CHECK_RCMGR_DEFAULTS") != "" { + // FIXME: Broken. Being tracked in https://github.com/ipfs/go-ipfs/issues/8949. + checkImplicitDefaults() + } // Return to use unmodified static limits based on values from go-libp2p 0.18 // return defaultLimits From 28a71e872e39f89f5c6ac7286a0fbbc8e4d97dda Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Thu, 12 May 2022 15:26:26 +0200 Subject: [PATCH 2/2] test: IPFS_CHECK_RCMGR_DEFAULTS enabled on CI --- .circleci/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/main.yml b/.circleci/main.yml index 7d80f03ff9d..18c5d55cd81 100644 --- a/.circleci/main.yml +++ b/.circleci/main.yml @@ -32,6 +32,7 @@ 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: