From 29829f7fea0d1a33cbc2529c21f31b6e7bd0fdab Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Wed, 29 Jan 2025 15:01:14 -0500 Subject: [PATCH] lower minimum timeout and tie apprequest deadlines to the maximum timeout --- peers/app_request_network.go | 1 - peers/external_handler.go | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/peers/app_request_network.go b/peers/app_request_network.go index 9160f99b..ceed56fb 100644 --- a/peers/app_request_network.go +++ b/peers/app_request_network.go @@ -40,7 +40,6 @@ import ( const ( InboundMessageChannelSize = 1000 - DefaultAppRequestTimeout = time.Second * 2 ValidatorRefreshPeriod = time.Second * 5 NumBootstrapNodes = 5 ) diff --git a/peers/external_handler.go b/peers/external_handler.go index 8a42f64f..f73903a6 100644 --- a/peers/external_handler.go +++ b/peers/external_handler.go @@ -21,6 +21,13 @@ import ( var _ router.ExternalHandler = &RelayerExternalHandler{} +const ( + maximumNetworkTimeout = constants.DefaultNetworkMaximumTimeout + + // Re-exposing DefaultAppRequestTimeout for use by message creators to set deadlines + DefaultAppRequestTimeout = maximumNetworkTimeout +) + // Note: all of the external handler's methods are called on peer goroutines. It // is possible for multiple concurrent calls to happen with different NodeIDs. // However, a given NodeID will only be performing one call at a time. @@ -47,8 +54,8 @@ func NewRelayerExternalHandler( // TODO: Leaving this static for now, but we may want to have this as a config option cfg := timer.AdaptiveTimeoutConfig{ InitialTimeout: constants.DefaultNetworkInitialTimeout, - MinimumTimeout: constants.DefaultNetworkInitialTimeout, - MaximumTimeout: constants.DefaultNetworkMaximumTimeout, + MinimumTimeout: constants.DefaultNetworkMinimumTimeout, + MaximumTimeout: maximumNetworkTimeout, TimeoutCoefficient: constants.DefaultNetworkTimeoutCoefficient, TimeoutHalflife: constants.DefaultNetworkTimeoutHalflife, }