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

Throttled removal of rep crawler targets (#3154)

Browse source 
* Throttled removal of rep crawler targets

* Remove recursion
This commit is contained in:
Sergey Kroshnin 2021-03-17 18:02:04 +03:00 • committed by GitHub
commit 8cc5f39fd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nano/node/repcrawler.cpp
View file

@ -155,7 +155,8 @@ void nano::rep_crawler::query (std::vector<std::shared_ptr<nano::transport::chan
node.workers.add_timed_task (std::chrono::steady_clock::now () + std::chrono::seconds (5), [node_w, hash = hash_root.first]() {
if (auto node_l = node_w.lock ())
{
node_l->rep_crawler.remove (hash);
auto target_finished_processed (node_l->vote_processor.total_processed + node_l->vote_processor.size ());
node_l->rep_crawler.throttled_remove (hash, target_finished_processed);
}
});
}
@ -167,6 +168,24 @@ void nano::rep_crawler::query (std::shared_ptr<nano::transport::channel> const &
query (peers);
}
void nano::rep_crawler::throttled_remove (nano::block_hash const & hash_a, uint64_t const target_finished_processed)
{
if (node.vote_processor.total_processed >= target_finished_processed)
{
remove (hash_a);
}
else
{
std::weak_ptr<nano::node> node_w (node.shared ());
node.workers.add_timed_task (std::chrono::steady_clock::now () + std::chrono::seconds (5), [node_w, hash_a, target_finished_processed]() {
if (auto node_l = node_w.lock ())
{
node_l->rep_crawler.throttled_remove (hash_a, target_finished_processed);
}
});
}
}
bool nano::rep_crawler::is_pr (nano::transport::channel const & channel_a) const
{
nano::lock_guard<nano::mutex> lock (probable_reps_mutex);

3
nano/node/repcrawler.hpp
View file

@ -83,6 +83,9 @@ public:
/** Remove block hash from list of active rep queries */
void remove (nano::block_hash const &);
/** Remove block hash from with delay depending on vote processor size */
void throttled_remove (nano::block_hash const &, uint64_t const);
/** Attempt to determine if the peer manages one or more representative accounts */
void query (std::vector<std::shared_ptr<nano::transport::channel>> const & channels_a);

1
nano/node/vote_processor.cpp
View file

@ -76,6 +76,7 @@ void nano::vote_processor::process_loop ()
lock.unlock ();
condition.notify_all ();
total_processed += votes_l.size ();
lock.lock ();
if (log_this_iteration && elapsed.stop () > std::chrono::milliseconds (100))

1
nano/node/vote_processor.hpp
View file

@ -48,6 +48,7 @@ public:
bool half_full ();
void calculate_weights ();
void stop ();
std::atomic<uint64_t> total_processed{ 0 };
private:
void process_loop ();