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

Increase default bootstrap interval (#2904)

Browse source
This commit is contained in:
Sergey Kroshnin 2020-09-02 11:09:32 +03:00 • committed by GitHub
commit 9cdd7ed911
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nano/node/node.cpp
View file

@ -813,11 +813,11 @@ void nano::node::ongoing_rep_calculation ()
void nano::node::ongoing_bootstrap () void nano::node::ongoing_bootstrap ()
{ {
auto next_wakeup (300); auto next_wakeup (network_params.node.bootstrap_interval);
if (warmed_up < 3) if (warmed_up < 3)
{ {
// Re-attempt bootstrapping more aggressively on startup // Re-attempt bootstrapping more aggressively on startup
next_wakeup = 5; next_wakeup = std::chrono::seconds (5);
if (!bootstrap_initiator.in_progress () && !network.empty ()) if (!bootstrap_initiator.in_progress () && !network.empty ())
{ {
++warmed_up; ++warmed_up;
@ -825,7 +825,7 @@ void nano::node::ongoing_bootstrap ()
} }
bootstrap_initiator.bootstrap (); bootstrap_initiator.bootstrap ();
std::weak_ptr<nano::node> node_w (shared_from_this ()); std::weak_ptr<nano::node> node_w (shared_from_this ());
alarm.add (std::chrono::steady_clock::now () + std::chrono::seconds (next_wakeup), [node_w]() { alarm.add (std::chrono::steady_clock::now () + next_wakeup, [node_w]() {
if (auto node_l = node_w.lock ()) if (auto node_l = node_w.lock ())
{ {
node_l->ongoing_bootstrap (); node_l->ongoing_bootstrap ();

1
nano/secure/common.cpp
View file

@ -145,6 +145,7 @@ nano::node_constants::node_constants (nano::network_constants & network_constant
cutoff = period * 5; cutoff = period * 5;
syn_cookie_cutoff = std::chrono::seconds (5); syn_cookie_cutoff = std::chrono::seconds (5);
backup_interval = std::chrono::minutes (5); backup_interval = std::chrono::minutes (5);
bootstrap_interval = std::chrono::seconds (15 * 60);
search_pending_interval = network_constants.is_dev_network () ? std::chrono::seconds (1) : std::chrono::seconds (5 * 60); search_pending_interval = network_constants.is_dev_network () ? std::chrono::seconds (1) : std::chrono::seconds (5 * 60);
peer_interval = search_pending_interval; peer_interval = search_pending_interval;
unchecked_cleaning_interval = std::chrono::minutes (30); unchecked_cleaning_interval = std::chrono::minutes (30);

1
nano/secure/common.hpp
View file

@ -410,6 +410,7 @@ public:
std::chrono::seconds cutoff; std::chrono::seconds cutoff;
std::chrono::seconds syn_cookie_cutoff; std::chrono::seconds syn_cookie_cutoff;
std::chrono::minutes backup_interval; std::chrono::minutes backup_interval;
std::chrono::seconds bootstrap_interval;
std::chrono::seconds search_pending_interval; std::chrono::seconds search_pending_interval;
std::chrono::seconds peer_interval; std::chrono::seconds peer_interval;
std::chrono::minutes unchecked_cleaning_interval; std::chrono::minutes unchecked_cleaning_interval;