rebroadcast only when there are live CIDs

Wondertan · Wondertan · commit 2690bfaf80ae · 2024-11-18T03:05:35.000+01:00
diff --git a/bitswap/client/internal/session/session.go b/bitswap/client/internal/session/session.go
@@ -375,10 +375,10 @@ func (s *Session) broadcast(ctx context.Context, wants []cid.Cid) {
 		log.Debugw("FindMorePeers", "session", s.id, "cid", wants[0], "pending", len(wants))
 		s.findMorePeers(ctx, wants[0])
 	}
-	s.resetIdleTick()
 
 	// If we have live wants record a consecutive tick
 	if s.sw.HasLiveWants() {
+		s.resetIdleTick()
 		s.consecutiveTicks++
 	}
 }
@@ -451,7 +451,10 @@ func (s *Session) handleReceive(ks []cid.Cid) {
 	// that have occurred since the last new block
 	s.consecutiveTicks = 0
 
-	s.resetIdleTick()
+	// reset rebroadcast timer if we still have outstanding wants
+	if s.sw.HasLiveWants() {
+		s.resetIdleTick()
+	}
 }
 
 // wantBlocks is called when blocks are requested by the client

Original file line number	Diff line number	Diff line change
`@@ -375,10 +375,10 @@ func (s *Session) broadcast(ctx context.Context, wants []cid.Cid) {`
`375`	`375`	`log.Debugw("FindMorePeers", "session", s.id, "cid", wants[0], "pending", len(wants))`
`376`	`376`	`s.findMorePeers(ctx, wants[0])`
`377`	`377`	`}`
`378`		`- s.resetIdleTick()`
`379`	`378`
`380`	`379`	`// If we have live wants record a consecutive tick`
`381`	`380`	`if s.sw.HasLiveWants() {`
	`381`	`+ s.resetIdleTick()`
`382`	`382`	`s.consecutiveTicks++`
`383`	`383`	`}`
`384`	`384`	`}`
`@@ -451,7 +451,10 @@ func (s *Session) handleReceive(ks []cid.Cid) {`
`451`	`451`	`// that have occurred since the last new block`
`452`	`452`	`s.consecutiveTicks = 0`
`453`	`453`
`454`		`- s.resetIdleTick()`
	`454`	`+ // reset rebroadcast timer if we still have outstanding wants`
	`455`	`+ if s.sw.HasLiveWants() {`
	`456`	`+ s.resetIdleTick()`
	`457`	`+ }`
`455`	`458`	`}`
`456`	`459`
`457`	`460`	`// wantBlocks is called when blocks are requested by the client`