[FAB-3664] Update chaincode.startuptimeout to duration

This CR updates the chaincode startup timeout from an integer to a time
duration. This has been done for consistency with other timeouts defined
for the peer and orderer.

Change-Id: Ib896808b52f15e7320641302d5ed21ffbc2a6c62
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

peer/node/start.go

@@ -23,7 +23,6 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"syscall"
 	"time"
@@ -296,12 +295,13 @@ func registerChaincodeSupport(grpcServer *grpc.Server) {
 	userRunsCC := chaincode.IsDevMode()
 
 	//get chaincode startup timeout
-	tOut, err := strconv.Atoi(viper.GetString("chaincode.startuptimeout"))
-	if err != nil { //what went wrong ?
-		logger.Warning("could not retrieve timeout var...setting to 5secs")
-		tOut = 5000
+	ccStartupTimeout := viper.GetDuration("chaincode.startuptimeout")
+	if ccStartupTimeout < time.Duration(5)*time.Second {
+		logger.Warningf("Invalid chaincode startup timeout value %s (should be at least 5s); defaulting to 5s", ccStartupTimeout)
+		ccStartupTimeout = time.Duration(5) * time.Second
+	} else {
+		logger.Debugf("Chaincode startup timeout value set to %s", ccStartupTimeout)
 	}
-	ccStartupTimeout := time.Duration(tOut) * time.Millisecond
 
 	ccSrv := chaincode.NewChaincodeSupport(peer.GetPeerEndpoint, userRunsCC, ccStartupTimeout)
 

sampleconfig/core.yaml

@@ -297,9 +297,9 @@ chaincode:
         Dockerfile:  |
             from $(DOCKER_NS)/fabric-javaenv:$(ARCH)-$(PROJECT_VERSION)
 
-    # timeout in millisecs for starting up a container and waiting for Register
+    # timeout duration for starting up a container and waiting for Register
     # to come through. 1sec should be plenty for chaincode unit tests
-    startuptimeout: 300000
+    startuptimeout: 300s
 
     # timeout in millisecs for invokes and initialize commands
     # this timeout is used by all chaincodes in all the channels including