[FAB-5950] exported peer retry policy to config file

exported connection timeout and reconnect maximal delay between subsequent retries of the delivery service to core.yaml config file.

Change-Id: I6a555838ea44c7c6ee49b564409e14faa757b8d6
Signed-off-by: nirro <nirro@il.ibm.com>

Author: nirrozenbaum

core/deliverservice/deliveryclient.go

@@ -33,17 +33,22 @@ func init() {
 
 const (
 	defaultReConnectTotalTimeThreshold = time.Second * 60 * 60
-)
-
-var (
-	connTimeout               = time.Second * 3
-	reConnectBackoffThreshold = float64(time.Hour)
+	defaultConnectionTimeout           = time.Second * 3
+	defaultReConnectBackoffThreshold   = float64(time.Hour)
 )
 
 func getReConnectTotalTimeThreshold() time.Duration {
 	return util.GetDurationOrDefault("peer.deliveryclient.reconnectTotalTimeThreshold", defaultReConnectTotalTimeThreshold)
 }
 
+func getConnectionTimeout() time.Duration {
+	return util.GetDurationOrDefault("peer.deliveryclient.connTimeout", defaultConnectionTimeout)
+}
+
+func getReConnectBackoffThreshold() float64 {
+	return util.GetFloat64OrDefault("peer.deliveryclient.reConnectBackoffThreshold", defaultReConnectBackoffThreshold)
+}
+
 // DeliverService used to communicate with orderers to obtain
 // new blocks and send them to the committer service
 type DeliverService interface {
@@ -222,7 +227,7 @@ func (d *deliverServiceImpl) newClient(chainID string, ledgerInfoProvider blocks
 		}
 		sleepIncrement := float64(time.Millisecond * 500)
 		attempt := float64(attemptNum)
-		return time.Duration(math.Min(math.Pow(2, attempt)*sleepIncrement, reConnectBackoffThreshold)), true
+		return time.Duration(math.Min(math.Pow(2, attempt)*sleepIncrement, getReConnectBackoffThreshold())), true
 	}
 	connProd := comm.NewConnectionProducer(d.conf.ConnFactory(chainID), d.conf.Endpoints)
 	bClient := NewBroadcastClient(connProd, d.conf.ABCFactory, broadcastSetup, backoffPolicy)
@@ -259,7 +264,7 @@ func DefaultConnectionFactory(channelID string) func(endpoint string) (*grpc.Cli
 		}
 		grpc.EnableTracing = true
 		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, connTimeout)
+		ctx, _ = context.WithTimeout(ctx, getConnectionTimeout())
 		return grpc.DialContext(ctx, endpoint, dialOpts...)
 	}
 }

gossip/util/misc.go

@@ -157,6 +157,18 @@ func GetIntOrDefault(key string, defVal int) int {
 	return defVal
 }
 
+// GetFloat64OrDefault returns the float64 value from config if present otherwise default value
+func GetFloat64OrDefault(key string, defVal float64) float64 {
+	viperLock.RLock()
+	defer viperLock.RUnlock()
+
+	if val := viper.GetFloat64(key); val != 0 {
+		return val
+	}
+
+	return defVal
+}
+
 // GetDurationOrDefault returns the Duration value from config if present otherwise default value
 func GetDurationOrDefault(key string, defVal time.Duration) time.Duration {
 	viperLock.RLock()

sampleconfig/core.yaml

@@ -332,6 +332,12 @@ peer:
         # attempts until its retry logic gives up and returns an error
         reconnectTotalTimeThreshold: 3600s
 
+        # It sets the delivery service <-> ordering service node connection timeout
+        connTimeout: 3s
+
+        # It sets the delivery service maximal delay between consecutive retries
+        reConnectBackoffThreshold: 3600s
+
     # Type for the local MSP - by default it's of type bccsp
     localMspType: bccsp