Merge "[FAB-3317] Update peer CouchDB timeout"

hyperledger · Apr 21, 2017 · d661d11 · d661d11
2 parents 6fdce35 + 5628d8e
commit d661d11
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/core/chaincode/chaincodetest.yaml b/core/chaincode/chaincodetest.yaml
@@ -433,7 +433,7 @@ ledger:
        # Number of retries for CouchDB errors during peer startup
        maxRetriesOnStartup: 10
        # CouchDB request timeout (unit: duration, e.g. 20s)
-       requestTimeout: 20s
+       requestTimeout: 35s
 
     # Limit on the number of records to return per query
     queryLimit: 10000

diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/statecouchdb_test.go b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/statecouchdb_test.go
@@ -48,7 +48,7 @@ func TestMain(m *testing.M) {
 	viper.Set("ledger.state.couchDBConfig.password", "")
 	viper.Set("ledger.state.couchDBConfig.maxRetries", 3)
 	viper.Set("ledger.state.couchDBConfig.maxRetriesOnStartup", 10)
-	viper.Set("ledger.state.couchDBConfig.requestTimeout", time.Second*20)
+	viper.Set("ledger.state.couchDBConfig.requestTimeout", time.Second*35)
 
 	//run the actual test
 	result := m.Run()

diff --git a/core/ledger/kvledger/txmgmt/txmgr/commontests/pkg_test.go b/core/ledger/kvledger/txmgmt/txmgr/commontests/pkg_test.go
@@ -113,7 +113,7 @@ func (env *couchDBLockBasedEnv) init(t *testing.T, testLedgerID string) {
 	viper.Set("ledger.state.couchDBConfig.password", "")
 	viper.Set("ledger.state.couchDBConfig.maxRetries", 3)
 	viper.Set("ledger.state.couchDBConfig.maxRetriesOnStartup", 10)
-	viper.Set("ledger.state.couchDBConfig.requestTimeout", time.Second*20)
+	viper.Set("ledger.state.couchDBConfig.requestTimeout", time.Second*35)
 	testDBEnv := statecouchdb.NewTestVDBEnv(t)
 	testDB, err := testDBEnv.DBProvider.GetDBHandle(testLedgerID)
 	testutil.AssertNoError(t, err, "")

diff --git a/core/ledger/ledgerconfig/ledger_config_test.go b/core/ledger/ledgerconfig/ledger_config_test.go
@@ -57,7 +57,7 @@ func TestGetCouchDBDefinition(t *testing.T) {
 	testutil.AssertEquals(t, couchDBDef.Password, "")
 	testutil.AssertEquals(t, couchDBDef.MaxRetries, 3)
 	testutil.AssertEquals(t, couchDBDef.MaxRetriesOnStartup, 10)
-	testutil.AssertEquals(t, couchDBDef.RequestTimeout, time.Second*20)
+	testutil.AssertEquals(t, couchDBDef.RequestTimeout, time.Second*35)
 }
 
 func TestIsHistoryDBEnabledDefault(t *testing.T) {

diff --git a/core/ledger/util/couchdb/couchdb_test.go b/core/ledger/util/couchdb/couchdb_test.go
@@ -78,7 +78,7 @@ func TestMain(m *testing.M) {
 	viper.Set("ledger.state.couchDBConfig.password", "")
 	viper.Set("ledger.state.couchDBConfig.maxRetries", 3)
 	viper.Set("ledger.state.couchDBConfig.maxRetriesOnStartup", 10)
-	viper.Set("ledger.state.couchDBConfig.requestTimeout", time.Second*20)
+	viper.Set("ledger.state.couchDBConfig.requestTimeout", time.Second*35)
 
 	// Create CouchDB definition from config parameters
 	couchDBDef = ledgerconfig.GetCouchDBDefinition()

diff --git a/peer/core.yaml b/peer/core.yaml
@@ -389,7 +389,7 @@ ledger:
        # Number of retries for CouchDB errors during peer startup
        maxRetriesOnStartup: 10
        # CouchDB request timeout (unit: duration, e.g. 20s)
-       requestTimeout: 20s
+       requestTimeout: 35s
 
     # Limit on the number of records to return per query
     queryLimit: 10000