diff --git a/.github/patches/retrieval.patch b/.github/patches/retrieval.patch new file mode 100644 index 00000000000..2bde7aa62c6 --- /dev/null +++ b/.github/patches/retrieval.patch @@ -0,0 +1,4 @@ +129c129 +< maxMultiplexForwards = 2 +--- +> maxMultiplexForwards = 0 diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml index 01c83d3e233..eeec2b3bb34 100644 --- a/.github/workflows/beekeeper.yml +++ b/.github/workflows/beekeeper.yml @@ -13,7 +13,7 @@ env: RUN_TYPE: "PR RUN" SETUP_CONTRACT_IMAGE_TAG: "0.9.9" BEELOCAL_BRANCH: "main" - BEEKEEPER_BRANCH: "master" + BEEKEEPER_BRANCH: "settlements-fix" BEEKEEPER_METRICS_ENABLED: false REACHABILITY_OVERRIDE_PUBLIC: true BATCHFACTOR_OVERRIDE_PUBLIC: 2 @@ -70,6 +70,7 @@ jobs: # patch pkg/postage/postagecontract/contract.go .github/patches/postagecontract.patch # patch pkg/postage/service.go .github/patches/postageservice.patch patch pkg/api/postage.go .github/patches/postage_api.patch + patch pkg/retrieval/retrieval.go .github/patches/retrieval.patch make binary mv dist/bee bee-1 - name: Apply patches and build - 2 diff --git a/pkg/retrieval/retrieval.go b/pkg/retrieval/retrieval.go index 551f08e6310..6b5a037e248 100644 --- a/pkg/retrieval/retrieval.go +++ b/pkg/retrieval/retrieval.go @@ -178,7 +178,7 @@ func (s *Service) RetrieveChunk(ctx context.Context, chunkAddr, sourcePeerAddr s } resultC := make(chan retrievalResult, 1) - retryC := make(chan struct{}, forwards) + retryC := make(chan struct{}, forwards+1) retry := func() { select {