[FAB-8627] Add clientChannel timeout conf

	timeout logic for the client handler is:
	1. get timeout from options
	2. if empty, then get timeout from config
	3. if empty, then use default timeout set in 'defaultHandlerTimeout'

	Also exposed Timeout function in the config interface
	The client can now use either TimeoutOrDefault (with preset default
	if type is not found in the config) or call Timeout (default is 0 if
	type is not found)

Change-Id: I05bca13fdae23af006a9291c737b7b4b2ee8d0d2
Signed-off-by: Baha Shaaban <baha.shaaban@securekey.com>

pkg/client/channel/chclient.go

@@ -26,7 +26,7 @@ import (
 var logger = logging.NewLogger("fabric_sdk_go")
 
 const (
-	defaultHandlerTimeout = time.Second * 10
+	defaultHandlerTimeout = time.Second * 180
 )
 
 // Client enables access to a channel on a Fabric network.
@@ -172,7 +172,12 @@ func (cc *Client) prepareHandlerContexts(request Request, o opts) (*invoke.Reque
 	}
 
 	if requestContext.Opts.Timeout == 0 {
-		requestContext.Opts.Timeout = defaultHandlerTimeout
+		to := cc.context.Config().Timeout(core.Execute)
+		if to == 0 {
+			requestContext.Opts.Timeout = defaultHandlerTimeout
+		} else {
+			requestContext.Opts.Timeout = to
+		}
 	}
 
 	return requestContext, clientContext, nil

pkg/context/api/core/provider.go

@@ -23,6 +23,7 @@ type Config interface {
 	CAClientCertPem(org string) (string, error)
 	CAClientCertPath(org string) (string, error)
 	TimeoutOrDefault(TimeoutType) time.Duration
+	Timeout(TimeoutType) time.Duration
 	MspID(org string) (string, error)
 	PeerMspID(name string) (string, error)
 	OrderersConfig() ([]OrdererConfig, error)

pkg/core/config/config.go

@@ -440,8 +440,22 @@ func (c *Config) CAClientCertPem(org string) (string, error) {
 	return ca.TLSCACerts.Client.Cert.Pem, nil
 }
 
-// TimeoutOrDefault reads connection timeouts for the given connection type
+// TimeoutOrDefault reads connection timeouts for the given timeout type, if not found, defaultTimeout is returned
 func (c *Config) TimeoutOrDefault(conn core.TimeoutType) time.Duration {
+	timeout := c.getTimeout(conn)
+	if timeout == 0 {
+		timeout = defaultTimeout
+	}
+
+	return timeout
+}
+
+// Timeout reads connection timeouts for the given timeout type, the default is 0 if type is not found in config
+func (c *Config) Timeout(conn core.TimeoutType) time.Duration {
+	return c.getTimeout(conn)
+}
+
+func (c *Config) getTimeout(conn core.TimeoutType) time.Duration {
 	var timeout time.Duration
 	switch conn {
 	case core.Endorser:
@@ -471,9 +485,6 @@ func (c *Config) TimeoutOrDefault(conn core.TimeoutType) time.Duration {
 			timeout = defaultConnIdleTimeout
 		}
 	}
-	if timeout == 0 {
-		timeout = defaultTimeout
-	}
 
 	return timeout
 }

pkg/core/config/testdata/config_test_pem.yaml

@@ -48,7 +48,7 @@ client:
     timeout:
       connection: 3s
       queryResponse: 45s
-      executeTxResponse: 30s
+      executeTxResponse: 60s
       discovery:
         greylistExpiry: 5s
   eventService:

pkg/core/config/testdata/template/config.yaml

@@ -49,7 +49,7 @@ client:
     timeout:
       connection: 3s
       queryResponse: 20s
-      executeTxResponse: 30s
+      executeTxResponse: 60s
       discovery:
         greylistExpiry: 5s
   eventService:

pkg/core/identitymgr/mocks/mockconfig.go

@@ -77,6 +77,11 @@ func (c *MockConfig) TimeoutOrDefault(core.TimeoutType) time.Duration {
 	return 0
 }
 
+//Timeout not implemented
+func (c *MockConfig) Timeout(core.TimeoutType) time.Duration {
+	return 0
+}
+
 // NetworkPeers returns the mock network peers configuration
 func (c *MockConfig) NetworkPeers() ([]core.NetworkPeer, error) {
 	return nil, nil

pkg/fab/mocks/mockconfig.go

@@ -105,6 +105,11 @@ func (c *MockConfig) TimeoutOrDefault(arg config.TimeoutType) time.Duration {
 	return time.Second * 5
 }
 
+//Timeout not implemented
+func (c *MockConfig) Timeout(arg config.TimeoutType) time.Duration {
+	return time.Second * 10
+}
+
 // PeersConfig Retrieves the fabric peers from the config file provided
 func (c *MockConfig) PeersConfig(org string) ([]config.PeerConfig, error) {
 	return nil, nil