refactor: Introduce EvictionManager and use it for the inbound eviction logic #25572
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
theuni
reviewed
Jul 8, 2022
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
This was referenced Jul 8, 2022
jnewbery
reviewed
Jul 13, 2022
| return ::SelectNodeToEvict(std::move(candidates)); | ||
| } | ||
|
|
||
| void EvictionManagerImpl::UpdateMinPingTime(NodeId id, std::chrono::microseconds ping_time) |
There was a problem hiding this comment.
/me idly wonders whether these setters can be templated to avoid repetitive boilerplate code
There was a problem hiding this comment.
Tried to come up with a cool way of doing this with templates but didn't end with anything useful.
There was a problem hiding this comment.
I think something like this would work:
class EvictionManagerImpl
{
...
template <typename Fn>
auto CandidateOp(NodeId id, Fn&& fn)
{
LOCK(m_candidates_mutex);
auto it = m_candidates.find(offset);
if (it != m_candidates.end()) {
return fn(it->second);
} else {
// return a dummy value of the right type, including void
return ([]() -> decltype(fn(it->second)) { return {}; })();
// EDIT: maybe nicer to write:
using T = decltype(fn(it->second));
return T();
}
}
...
};
void EvictionManager::UpdateLastBlockTime(NodeId id, std::chrono::seconds block_time)
{
m_impl->CandidateOp(id, [](NodeEvictionCandidate& nec) {
nec.m_last_block_time = block_time;
});
}
void EvictionManager::GetLastBlockTime(NodeId id) const
{
return m_impl->CandidateOp(id, [](const NodeEvictionCandidate& nec) {
return nec.m_last_block_time;
});
}
jnewbery
reviewed
Jul 13, 2022
2f93a9f to
c53efed
Compare
c53efed to
ebdb034
Compare
|
Rebased. |
This was referenced Jul 28, 2022
ebdb034 to
4f8be70
Compare
|
Needs rebase if still relevant |
ac60275 to
108e7a0
Compare
108e7a0 to
a7a5b4e
Compare
We temporarily introduce a method to get a specific NodeEvictionCandidate from the eviction manager for use in `CConnman::AttemptToEvictConnection()`. `EvictionManager::GetCandidate` is removed once we are done moving the remaining eviction state from `CNode` to the eviction manager.
Now that the eviction manager is aware of the keyed net group and whether or not a peer is prefered for eviction, we can get rid of the corresponding CNode members, since they are not used elsewhere.
a7a5b4e to
2977ca3
Compare
This was referenced Jul 28, 2023
|
🐙 This pull request conflicts with the target branch and needs rebase. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR splits off the next couple commits from #25268 that introduce the
EvictionManagerand use it for the inbound eviction logic.One instance of the
EvictionManageris created at start up and passed as a reference to the connection and peer managers. The connection and peer managers report all eviction relevant information (for inbound connections) to the eviction manager who ultimately suggests nodes to evict as the result ofEvictionManager::SelectNodeToEvict.