opt: reduce unnecessary pullsyncing (#4764)

ethersphere · Aug 16, 2024 · d7c234a · d7c234a
1 parent 2374b05
commit d7c234a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/pkg/puller/puller.go b/pkg/puller/puller.go
@@ -40,6 +40,8 @@ const (
 	recalcPeersDur = time.Minute * 5
 
 	maxChunksPerSecond = 1000 // roughly 4 MB/s
+
+	maxPODelta = 2 // the lowest level of proximity order (of peers) subtracted from the storage radius allowed for chunk syncing.
 )
 
 type Options struct {
@@ -262,6 +264,7 @@ func (p *Puller) syncPeer(ctx context.Context, peer *syncPeer, storageRadius uin
 	*/
 
 	if peer.po >= storageRadius {
+
 		// cancel all bins lower than the storage radius
 		for bin := uint8(0); bin < storageRadius; bin++ {
 			peer.cancelBin(bin)
@@ -274,7 +277,7 @@ func (p *Puller) syncPeer(ctx context.Context, peer *syncPeer, storageRadius uin
 			}
 		}
 
-	} else {
+	} else if storageRadius-peer.po <= maxPODelta {
 		// cancel all non-po bins, if any
 		for bin := uint8(0); bin < p.bins; bin++ {
 			if bin != peer.po {
@@ -285,6 +288,10 @@ func (p *Puller) syncPeer(ctx context.Context, peer *syncPeer, storageRadius uin
 		if !peer.isBinSyncing(peer.po) {
 			p.syncPeerBin(ctx, peer, peer.po, peer.cursors[peer.po])
 		}
+	} else {
+		for bin := uint8(0); bin < p.bins; bin++ {
+			peer.cancelBin(bin)
+		}
 	}
 
 	return nil

diff --git a/pkg/pullsync/pullsync.go b/pkg/pullsync/pullsync.go
@@ -48,7 +48,7 @@ const (
 	MaxCursor               = math.MaxUint64
 	DefaultMaxPage   uint64 = 250
 	pageTimeout             = time.Second
-	makeOfferTimeout        = 5 * time.Minute
+	makeOfferTimeout        = 15 * time.Minute
 )
 
 // Interface is the PullSync interface.