Skip to content

[FAB-17109] Retrieve ReConnectBackoffThreshold as duration #951

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 1 commit into from
Mar 31, 2020
Merged

[FAB-17109] Retrieve ReConnectBackoffThreshold as duration #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions core/deliverservice/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
)

const (
DefaultReConnectBackoffThreshold = float64(time.Hour)
DefaultReConnectBackoffThreshold = time.Hour * 1
DefaultReConnectTotalTimeThreshold = time.Second * 60 * 60
DefaultConnectionTimeout = time.Second * 3
)
Expand All @@ -30,7 +30,7 @@ type DeliverServiceConfig struct {
// PeerTLSEnabled enables/disables Peer TLS.
PeerTLSEnabled bool
// ReConnectBackoffThreshold sets the delivery service maximal delay between consencutive retries.
ReConnectBackoffThreshold float64
ReConnectBackoffThreshold time.Duration
// ReconnectTotalTimeThreshold sets the total time the delivery service may spend in reconnection attempts
// until its retry logic gives up and returns an error.
ReconnectTotalTimeThreshold time.Duration
Expand Down Expand Up @@ -97,7 +97,7 @@ func LoadOverridesMap() (map[string]*orderers.Endpoint, error) {
func (c *DeliverServiceConfig) loadDeliverServiceConfig() {
c.PeerTLSEnabled = viper.GetBool("peer.tls.enabled")

c.ReConnectBackoffThreshold = viper.GetFloat64("peer.deliveryclient.reConnectBackoffThreshold")
c.ReConnectBackoffThreshold = viper.GetDuration("peer.deliveryclient.reConnectBackoffThreshold")
if c.ReConnectBackoffThreshold == 0 {
c.ReConnectBackoffThreshold = DefaultReConnectBackoffThreshold
}
Expand Down
4 changes: 2 additions & 2 deletions core/deliverservice/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestGlobalConfig(t *testing.T) {
defer viper.Reset()

viper.Set("peer.tls.enabled", true)
viper.Set("peer.deliveryclient.reConnectBackoffThreshold", 25.5)
viper.Set("peer.deliveryclient.reConnectBackoffThreshold", "25s")
viper.Set("peer.deliveryclient.reconnectTotalTimeThreshold", "20s")
viper.Set("peer.deliveryclient.connTimeout", "10s")
viper.Set("peer.keepalive.deliveryClient.interval", "5s")
Expand All @@ -94,7 +94,7 @@ func TestGlobalConfig(t *testing.T) {

expectedConfig := &deliverservice.DeliverServiceConfig{
PeerTLSEnabled: true,
ReConnectBackoffThreshold: 25.5,
ReConnectBackoffThreshold: 25 * time.Second,
ReconnectTotalTimeThreshold: 20 * time.Second,
ConnectionTimeout: 10 * time.Second,
KeepaliveOptions: comm.KeepaliveOptions{
Expand Down
2 changes: 1 addition & 1 deletion core/deliverservice/deliveryclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func (d *deliverServiceImpl) StartDeliverForChannel(chainID string, ledgerInfo b
Signer: d.conf.Signer,
DeliverStreamer: DeliverAdapter{},
Logger: flogging.MustGetLogger("peer.blocksprovider").With("channel", chainID),
MaxRetryDelay: time.Duration(d.conf.DeliverServiceConfig.ReConnectBackoffThreshold),
MaxRetryDelay: d.conf.DeliverServiceConfig.ReConnectBackoffThreshold,
MaxRetryDuration: d.conf.DeliverServiceConfig.ReconnectTotalTimeThreshold,
InitialRetryDelay: 100 * time.Millisecond,
YieldLeadership: !d.conf.IsStaticLeader,
Expand Down