From 27c66f0276d0b423fe2f57f8b0be30dc49b9b0e6 Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Wed, 15 May 2024 16:22:30 -0500 Subject: [PATCH 1/2] GH-141 Do not report applied if in dispatcher --- plugins/net_plugin/net_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp index ceae2890ed..69e5490e4f 100644 --- a/plugins/net_plugin/net_plugin.cpp +++ b/plugins/net_plugin/net_plugin.cpp @@ -3118,7 +3118,7 @@ namespace eosio { if( my_impl->dispatcher.have_block( blk_id ) ) { peer_dlog( this, "canceling wait, already received block ${num}, id ${id}...", ("num", blk_num)("id", blk_id.str().substr(8,16)) ); - my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num, true, fc::microseconds::maximum() ); + my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num, false, fc::microseconds::maximum() ); cancel_wait(); pending_message_buffer.advance_read_ptr( message_length ); From 8068994ed35da36283adb3f38f885b6dc5c054a9 Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Wed, 15 May 2024 19:49:41 -0500 Subject: [PATCH 2/2] GH-141 Use different fetch spans for catchup test --- tests/nodeos_startup_catchup.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/nodeos_startup_catchup.py b/tests/nodeos_startup_catchup.py index b36b829401..55c7aca875 100755 --- a/tests/nodeos_startup_catchup.py +++ b/tests/nodeos_startup_catchup.py @@ -57,9 +57,20 @@ cluster.setWalletMgr(walletMgr) Print("Stand up cluster") - if cluster.launch(prodCount=prodCount, activateIF=activateIF, onlyBios=False, pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, - unstartedNodes=catchupCount, loadSystemContract=True, - maximumP2pPerHost=totalNodes+trxGeneratorCnt) is False: + specificExtraNodeosArgs = {} + specificExtraNodeosArgs[pnodes+1] = f' --sync-fetch-span 1 ' + specificExtraNodeosArgs[pnodes+2] = f' --sync-fetch-span 5 ' + specificExtraNodeosArgs[pnodes+3] = f' --sync-fetch-span 21 ' + specificExtraNodeosArgs[pnodes+4] = f' --sync-fetch-span 89 ' + specificExtraNodeosArgs[pnodes+5] = f' --sync-fetch-span 377 ' + specificExtraNodeosArgs[pnodes+6] = f' --sync-fetch-span 1597 ' + specificExtraNodeosArgs[pnodes+7] = f' --sync-fetch-span 1597 ' + specificExtraNodeosArgs[pnodes+8] = f' --sync-fetch-span 6765 ' + specificExtraNodeosArgs[pnodes+9] = f' --sync-fetch-span 28657 ' + specificExtraNodeosArgs[pnodes+10] = f' --sync-fetch-span 89 ' + if cluster.launch(prodCount=prodCount, specificExtraNodeosArgs=specificExtraNodeosArgs, activateIF=activateIF, onlyBios=False, + pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, unstartedNodes=catchupCount, + loadSystemContract=True, maximumP2pPerHost=totalNodes+trxGeneratorCnt) is False: Utils.errorExit("Failed to stand up eos cluster.") Print("Create test wallet")