From a6aa9a792490928aa95d5e4cfa31781ebe2e522a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:44:04 +0100 Subject: [PATCH] Use lowest priority for dependency scan --- nano/lib/stats_enums.hpp | 5 +++-- nano/node/bootstrap/account_sets.cpp | 6 +++--- nano/node/bootstrap/bootstrap_service.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/nano/lib/stats_enums.hpp b/nano/lib/stats_enums.hpp index ffb66241b..5367bc868 100644 --- a/nano/lib/stats_enums.hpp +++ b/nano/lib/stats_enums.hpp @@ -485,8 +485,9 @@ enum class detail blocking_insert, blocking_overflow, priority_insert, - priority_erase_by_threshold, - priority_erase_by_blocking, + priority_set, + erase_by_threshold, + erase_by_blocking, priority_overflow, deprioritize, deprioritize_failed, diff --git a/nano/node/bootstrap/account_sets.cpp b/nano/node/bootstrap/account_sets.cpp index 6a796188b..39857cead 100644 --- a/nano/node/bootstrap/account_sets.cpp +++ b/nano/node/bootstrap/account_sets.cpp @@ -65,7 +65,7 @@ void nano::bootstrap::account_sets::priority_down (nano::account const & account auto priority_new = iter->priority / account_sets::priority_divide; if (priority_new <= account_sets::priority_cutoff) { - stats.inc (nano::stat::type::bootstrap_account_sets, nano::stat::detail::priority_erase_by_threshold); + stats.inc (nano::stat::type::bootstrap_account_sets, nano::stat::detail::erase_by_threshold); priorities.get ().erase (iter); } else @@ -93,7 +93,7 @@ void nano::bootstrap::account_sets::priority_set (nano::account const & account, auto iter = priorities.get ().find (account); if (iter == priorities.get ().end ()) { - stats.inc (nano::stat::type::bootstrap_account_sets, nano::stat::detail::priority_insert); + stats.inc (nano::stat::type::bootstrap_account_sets, nano::stat::detail::priority_set); priorities.get ().insert ({ account, priority }); trim_overflow (); } @@ -114,7 +114,7 @@ void nano::bootstrap::account_sets::block (nano::account const & account, nano:: auto entry = (existing == priorities.get ().end ()) ? priority_entry{ account, 0 } : *existing; priorities.get ().erase (account); - stats.inc (nano::stat::type::bootstrap_account_sets, nano::stat::detail::priority_erase_by_blocking); + stats.inc (nano::stat::type::bootstrap_account_sets, nano::stat::detail::erase_by_blocking); blocking.get ().insert ({ entry, dependency }); stats.inc (nano::stat::type::bootstrap_account_sets, nano::stat::detail::blocking_insert); diff --git a/nano/node/bootstrap/bootstrap_service.cpp b/nano/node/bootstrap/bootstrap_service.cpp index 98ea07c9c..17fdf2a30 100644 --- a/nano/node/bootstrap/bootstrap_service.cpp +++ b/nano/node/bootstrap/bootstrap_service.cpp @@ -843,7 +843,7 @@ void nano::bootstrap_service::process (const nano::asc_pull_ack::account_info_pa { nano::lock_guard lock{ mutex }; accounts.dependency_update (tag.hash, response.account); - accounts.priority_set (response.account); + accounts.priority_set (response.account, nano::bootstrap::account_sets::priority_cutoff); // Use the lowest possible priority here } }