Skip to content

Bitswap: Set DontHaveTimeout/MinTimeout to 25ms #959

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

Merged
merged 4 commits into from
Jun 25, 2025
Merged

Bitswap: Set DontHaveTimeout/MinTimeout to 25ms #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95f4b1d
Bitswap: Set DontHaveTimeout/MinTimeout to 200ms.
hsanjuan Jun 22, 2025
2fc8a75
bitswap/donthavetimeout: attempt to fix tests by reducing minTimeout
hsanjuan Jun 24, 2025
ab05eaf
bitswap/dontHaveTimeout: Lower MinTimeout to 25ms
hsanjuan Jun 25, 2025
faa4995
Merge remote-tracking branch 'origin/main' into bitswap-min-donthave-…
hsanjuan Jun 25, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ The following emojis are used to highlight certain changes:

### Changed

- `DontHaveTimeoutConfig`'s default `MinTimeout` is changed from `0` to `25ms`.
- upgrade to `go-libp2p` [v0.42.0](https://github.com/libp2p/go-libp2p/releases/tag/v0.42.0)

### Removed
Expand Down
1 change: 1 addition & 0 deletions bitswap/client/internal/messagequeue/donthavetimeoutmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ type DontHaveTimeoutConfig struct {
func DefaultDontHaveTimeoutConfig() *DontHaveTimeoutConfig {
cfg := DontHaveTimeoutConfig{
DontHaveTimeout: 5 * time.Second,
MinTimeout: 25 * time.Millisecond,
MaxExpectedWantProcessTime: 2 * time.Second,
PingLatencyMultiplier: 3,
MessageLatencyAlpha: 0.5,
Expand Down
13 changes: 13 additions & 0 deletions bitswap/client/internal/messagequeue/donthavetimeoutmgr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ func TestDontHaveTimeoutMgrTimeout(t *testing.T) {
cfg := DefaultDontHaveTimeoutConfig()
cfg.PingLatencyMultiplier = latMultiplier
cfg.MaxExpectedWantProcessTime = expProcessTime
cfg.MinTimeout = 10 * time.Millisecond
cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down Expand Up @@ -160,6 +161,7 @@ func TestDontHaveTimeoutMgrCancel(t *testing.T) {
cfg := DefaultDontHaveTimeoutConfig()
cfg.PingLatencyMultiplier = latMultiplier
cfg.MaxExpectedWantProcessTime = expProcessTime
cfg.MinTimeout = 10 * time.Millisecond
cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down Expand Up @@ -201,6 +203,7 @@ func TestDontHaveTimeoutWantCancelWant(t *testing.T) {
cfg := DefaultDontHaveTimeoutConfig()
cfg.PingLatencyMultiplier = latMultiplier
cfg.MaxExpectedWantProcessTime = expProcessTime
cfg.MinTimeout = 10 * time.Millisecond
cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down Expand Up @@ -258,6 +261,8 @@ func TestDontHaveTimeoutRepeatedAddPending(t *testing.T) {
cfg := DefaultDontHaveTimeoutConfig()
cfg.PingLatencyMultiplier = latMultiplier
cfg.MaxExpectedWantProcessTime = expProcessTime
cfg.MinTimeout = 10 * time.Millisecond

cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down Expand Up @@ -298,6 +303,8 @@ func TestDontHaveTimeoutMgrMessageLatency(t *testing.T) {
cfg.PingLatencyMultiplier = latMultiplier
cfg.MessageLatencyMultiplier = msgLatencyMultiplier
cfg.MaxExpectedWantProcessTime = expProcessTime
cfg.MinTimeout = 10 * time.Millisecond

cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down Expand Up @@ -350,6 +357,8 @@ func TestDontHaveTimeoutMgrMessageLatencyMax(t *testing.T) {
cfg := DefaultDontHaveTimeoutConfig()
cfg.MessageLatencyMultiplier = msgLatencyMultiplier
cfg.MaxTimeout = testMaxTimeout
cfg.MinTimeout = 10 * time.Millisecond

cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down Expand Up @@ -392,6 +401,7 @@ func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfPingError(t *testing.T) {
cfg.DontHaveTimeout = defaultTimeout
cfg.PingLatencyMultiplier = latMultiplier
cfg.MaxExpectedWantProcessTime = expProcessTime
cfg.MinTimeout = 10 * time.Millisecond
cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down Expand Up @@ -438,6 +448,8 @@ func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfLatencyLonger(t *testing.T) {
cfg.DontHaveTimeout = defaultTimeout
cfg.PingLatencyMultiplier = latMultiplier
cfg.MaxExpectedWantProcessTime = expProcessTime
cfg.MinTimeout = 10 * time.Millisecond

cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down Expand Up @@ -482,6 +494,7 @@ func TestDontHaveTimeoutNoTimeoutAfterShutdown(t *testing.T) {
cfg := DefaultDontHaveTimeoutConfig()
cfg.PingLatencyMultiplier = latMultiplier
cfg.MaxExpectedWantProcessTime = expProcessTime
cfg.MinTimeout = 10 * time.Millisecond
cfg.timeoutsSignal = timeoutsTriggered
cfg.clock = clock
dhtm := newDontHaveTimeoutMgr(pc, tr.onTimeout, cfg)
Expand Down