Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Change processed blocks factor for requeued pulls (#2437)

Browse source 
From `processed blocks / 10000` to `processed blocks / 4096` for better processing of largest chains in case of failures
This commit is contained in:
Sergey Kroshnin 2020-01-16 12:14:15 +03:00 • committed by GitHub
commit c96f4f0f58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nano/node/bootstrap/bootstrap.cpp
View file

@ -23,6 +23,7 @@ constexpr double nano::bootstrap_limits::required_frontier_confirmation_ratio;
constexpr unsigned nano::bootstrap_limits::frontier_confirmation_blocks_limit;
constexpr unsigned nano::bootstrap_limits::requeued_pulls_limit;
constexpr unsigned nano::bootstrap_limits::requeued_pulls_limit_test;
constexpr unsigned nano::bootstrap_limits::requeued_pulls_processed_blocks_factor;
constexpr std::chrono::seconds nano::bootstrap_limits::lazy_flush_delay_sec;
constexpr unsigned nano::bootstrap_limits::lazy_destinations_request_limit;
constexpr uint64_t nano::bootstrap_limits::lazy_batch_pull_count_resize_blocks_limit;
@ -605,7 +606,7 @@ void nano::bootstrap_attempt::requeue_pull (nano::pull_info const & pull_a, bool
++pull.attempts;
}
++requeued_pulls;
if (mode != nano::bootstrap_mode::lazy && pull.attempts < pull.retry_limit + (pull.processed / 10000))
if (mode != nano::bootstrap_mode::lazy && pull.attempts < pull.retry_limit + (pull.processed / nano::bootstrap_limits::requeued_pulls_processed_blocks_factor))
{
nano::lock_guard<std::mutex> lock (mutex);
pulls.push_front (pull);

1
nano/node/bootstrap/bootstrap.hpp
View file

@ -293,6 +293,7 @@ public:
static constexpr unsigned frontier_confirmation_blocks_limit = 128 * 1024;
static constexpr unsigned requeued_pulls_limit = 256;
static constexpr unsigned requeued_pulls_limit_test = 2;
static constexpr unsigned requeued_pulls_processed_blocks_factor = 4096;
static constexpr unsigned bulk_push_cost_limit = 200;
static constexpr std::chrono::seconds lazy_flush_delay_sec = std::chrono::seconds (5);
static constexpr unsigned lazy_destinations_request_limit = 256 * 1024;