Merge pull request #849 from skalenetwork/IS-495-catchup-timeout

IS 945 increase timeouts for catchup

Author: olehnikolaiev

.github/workflows/build.yml

@@ -173,7 +173,7 @@ jobs:
 
     - name: verify jsonrpc has been built
       run: ls libBLS/deps/deps_inst/x86_or_x64/include/jsonrpccpp/client.h
-    
+
     - name: build consensus
       run: |
         cd scripts && ./build.py Debug

SkaleCommon.h

@@ -183,6 +183,14 @@ static constexpr uint64_t WAIT_AFTER_NETWORK_ERROR_MS = 3000;
 
 static constexpr uint64_t CONNECTION_REFUSED_LOG_INTERVAL_MS = 10 * 60 * 1000;
 
+static constexpr uint64_t CATCHUP_TIMEOUT_SEC = 30;
+
+static constexpr uint64_t SYNC_NODE_CATCHUP_TIMEOUT_SEC = 300;
+
+static constexpr uint64_t READ_JSON_HEADER_TIMEOUT_SEC = 6;
+
+static constexpr uint64_t SYNC_NODE_READ_JSON_HEADER_TIMEOUT_SEC = 300;
+
 // Non-tunable params
 
 static constexpr uint32_t SOCKET_BACKLOG = 64;

catchup/client/CatchupClientAgent.cpp

@@ -75,8 +75,10 @@ nlohmann::json CatchupClientAgent::readCatchupResponseHeader(
     const ptr< ClientSocket >& _socket, ptr< CatchupRequestHeader > _requestHeader ) {
     CHECK_ARGUMENT( _socket )
     CHECK_ARGUMENT( _requestHeader )
+    uint32_t timeoutSec = getNode()->isSyncOnlyNode() ? getNode()->getsyncNodeCatchupTimeoutSec() :
+                                                        getNode()->getCatchupTimeoutSec();
     auto result = sChain->getIo()->readJsonHeader( _socket->getDescriptor(),
-        "Read catchup response", 30, _socket->getIP(), MAX_CATCHUP_DOWNLOAD_BYTES );
+        "Read catchup response", timeoutSec, _socket->getIP(), MAX_CATCHUP_DOWNLOAD_BYTES );
     return result;
 }
 

network/IO.cpp

@@ -264,7 +264,10 @@ nlohmann::json IO::readJsonHeader( file_descriptor descriptor, const char* _erro
     auto buf2 = make_shared< vector< uint8_t > >( sizeof( uint64_t ) );
 
     try {
-        readBytes( descriptor, buf2, msg_len( sizeof( uint64_t ) ), 6 );
+        uint32_t timeoutSec = sChain->getNode()->isSyncOnlyNode() ?
+                                sChain->getNode()->getsyncNodeReadJsonHeaderTimeoutSec() :
+                                sChain->getNode()->getReadJsonHeaderTimeoutSec();
+        readBytes( descriptor, buf2, msg_len( sizeof( uint64_t ) ), timeoutSec );
     } catch ( ExitRequestedException& ) {
         throw;
     } catch ( ... ) {

node/Node.cpp

@@ -252,6 +252,13 @@ void Node::initParamsFromConfig() {
     maxTransactionsPerBlock =
         getParamUint64( "maxTransactionsPerBlock", MAX_TRANSACTIONS_PER_BLOCK );
     minBlockIntervalMs = getParamUint64( "minBlockIntervalMs", MIN_BLOCK_INTERVAL_MS );
+    catchupTimeoutSec = getParamUint64( "catchupTimeoutSec", CATCHUP_TIMEOUT_SEC );
+    syncNodeCatchupTimeoutSec =
+        getParamUint64( "syncNodeCatchupTimeoutSec", SYNC_NODE_CATCHUP_TIMEOUT_SEC );
+    readJsonHeaderTimeoutSec =
+        getParamUint64( "readJsonHeaderTimeoutSec", READ_JSON_HEADER_TIMEOUT_SEC );
+    syncNodeReadJsonHeaderTimeoutSec =
+        getParamUint64( "syncNodeReadJsonHeaderTimeoutSec", SYNC_NODE_READ_JSON_HEADER_TIMEOUT_SEC );
     testNet = ( getParamUint64( "isTestNet", 0 ) > 0 );
 
     blockDBSize = storageLimits->getBlockDbSize();

node/Node.h

@@ -202,6 +202,14 @@ class Node {
     uint64_t minBlockIntervalMs = 0;
 
     uint64_t blockDBSize = 0;
+
+    uint64_t catchupTimeoutSec = 0;
+
+    uint64_t syncNodeCatchupTimeoutSec = 0;
+
+    uint64_t readJsonHeaderTimeoutSec = 0;
+
+    uint64_t syncNodeReadJsonHeaderTimeoutSec = 0;
     ;
     uint64_t proposalHashDBSize = 0;
     uint64_t proposalVectorDBSize = 0;
@@ -397,6 +405,14 @@ class Node {
     uint64_t getMaxTransactionsPerBlock() const;
 
     uint64_t getMinBlockIntervalMs() const;
+    
+    uint64_t getCatchupTimeoutSec() const;
+
+    uint64_t getsyncNodeCatchupTimeoutSec() const;
+
+    uint64_t getReadJsonHeaderTimeoutSec() const;
+
+    uint64_t getsyncNodeReadJsonHeaderTimeoutSec() const;
 
     uint64_t getWaitAfterNetworkErrorMs();
 

node/NodeGettersSetters.cpp

@@ -429,3 +429,19 @@ void Node::setExitOnBlockBoundaryRequested() {
     LOG( info, "Set exit on block boundary" );
     exitOnBlockBoundaryRequested = true;
 }
+
+uint64_t Node::getCatchupTimeoutSec() const {
+    return catchupTimeoutSec;
+}
+
+uint64_t Node::getsyncNodeCatchupTimeoutSec() const {
+    return syncNodeCatchupTimeoutSec;
+}
+
+uint64_t Node::getReadJsonHeaderTimeoutSec() const {
+    return readJsonHeaderTimeoutSec;
+}
+
+uint64_t Node::getsyncNodeReadJsonHeaderTimeoutSec() const {
+    return syncNodeReadJsonHeaderTimeoutSec;
+}