Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(puller): limiter #4504

Merged
merged 2 commits into from
Dec 13, 2023
Merged

feat(puller): limiter #4504

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca79d9a
feat(puller): limiter
istae Dec 13, 2023
4ed7149
fix: limiter
istae Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pkg/puller/puller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/ethersphere/bee/pkg/storer"
"github.com/ethersphere/bee/pkg/swarm"
"github.com/ethersphere/bee/pkg/topology"
ratelimit "golang.org/x/time/rate"
)

// loggerName is the tree path name of the logger for this package.
Expand Down Expand Up @@ -65,6 +66,8 @@ type Puller struct {
rate *rate.Rate // rate of historical syncing

start sync.Once

limiter *ratelimit.Limiter
}

func New(
Expand Down Expand Up @@ -92,6 +95,7 @@ func New(
blockLister: blockLister,
rate: rate.New(DefaultHistRateWindow),
cancel: func() { /* Noop, since the context is initialized in the Start(). */ },
limiter: ratelimit.NewLimiter(ratelimit.Every(time.Second), int(swarm.MaxBins)), // allows for 1 sync per second, max bins bursts
}

return p
Expand Down Expand Up @@ -301,15 +305,18 @@ func (p *Puller) syncWorker(ctx context.Context, peer swarm.Address, bin uint8,

for {

// rate limit within neighborhood
if bin >= p.radius.StorageRadius() {
_ = p.limiter.Wait(ctx)
}

select {
case <-ctx.Done():
loggerV2.Debug("syncWorker context cancelled", "peer_address", peer, "bin", bin)
return
default:
}

p.metrics.SyncWorkerIterCounter.Inc()

s, _, _, err := p.nextPeerInterval(peer, bin)
if err != nil {
p.metrics.SyncWorkerErrCounter.Inc()
Expand Down
Loading