From ebbc881ebbd9a1599afee35aeaf8893486c32563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Thu, 27 Jun 2024 20:29:34 +0200 Subject: [PATCH] Avoid bootstrap notifications from live traffic (#4463) --- nano/node/bootstrap_ascending/service.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/nano/node/bootstrap_ascending/service.cpp b/nano/node/bootstrap_ascending/service.cpp index 8bceda97d..7d295b321 100644 --- a/nano/node/bootstrap_ascending/service.cpp +++ b/nano/node/bootstrap_ascending/service.cpp @@ -31,20 +31,27 @@ nano::bootstrap_ascending::service::service (nano::node_config & config_a, nano: scoring{ config.bootstrap_ascending, config.network_params.network }, database_limiter{ config.bootstrap_ascending.database_requests_limit, 1.0 } { - // TODO: This is called from a very congested blockprocessor thread. Offload this work to a dedicated processing thread block_processor.batch_processed.add ([this] (auto const & batch) { + bool should_notify = false; { nano::lock_guard lock{ mutex }; auto transaction = ledger.tx_begin_read (); for (auto const & [result, context] : batch) { - debug_assert (context.block != nullptr); - inspect (transaction, result, *context.block); + // Do not try to unnecessarily bootstrap live traffic chains + if (context.source == nano::block_source::bootstrap) + { + release_assert (context.block != nullptr); + inspect (transaction, result, *context.block); + should_notify = true; + } } } - - condition.notify_all (); + if (should_notify) + { + condition.notify_all (); + } }); }