Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13711170
D13004.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Subscribers
None
D13004.diff
View Options
diff --git a/src/net.h b/src/net.h
--- a/src/net.h
+++ b/src/net.h
@@ -676,7 +676,7 @@
* This is expected to be called at a fixed interval of
* AVALANCHE_STATISTICS_REFRESH_PERIOD.
*/
- void updateAvailabilityScore();
+ void updateAvailabilityScore(double decayFactor);
double getAvailabilityScore() const;
// Store the next time we will consider a getavaaddr message from this peer
diff --git a/src/net.cpp b/src/net.cpp
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -12,7 +12,6 @@
#include <addrdb.h>
#include <addrman.h>
#include <avalanche/avalanche.h>
-#include <avalanche/statistics.h>
#include <banman.h>
#include <clientversion.h>
#include <compat.h>
@@ -3414,7 +3413,7 @@
invCounters += uint64_t(count) << 32;
}
-void CNode::updateAvailabilityScore() {
+void CNode::updateAvailabilityScore(double decayFactor) {
if (!m_avalanche_enabled) {
return;
}
@@ -3426,8 +3425,7 @@
int64_t votes = windowInvCounters >> 32;
availabilityScore =
- AVALANCHE_STATISTICS_DECAY_FACTOR * (2 * votes - polls) +
- (1. - AVALANCHE_STATISTICS_DECAY_FACTOR) * previousScore;
+ decayFactor * (2 * votes - polls) + (1. - decayFactor) * previousScore;
}
double CNode::getAvailabilityScore() const {
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1702,8 +1702,9 @@
}
void PeerManagerImpl::UpdateAvalancheStatistics() const {
- m_connman.ForEachNode(
- [](CNode *pnode) { pnode->updateAvailabilityScore(); });
+ m_connman.ForEachNode([](CNode *pnode) {
+ pnode->updateAvailabilityScore(AVALANCHE_STATISTICS_DECAY_FACTOR);
+ });
}
void PeerManagerImpl::AvalanchePeriodicNetworking(CScheduler &scheduler) const {
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -920,82 +920,91 @@
}
BOOST_AUTO_TEST_CASE(avalanche_statistics) {
- const uint32_t step = AVALANCHE_STATISTICS_REFRESH_PERIOD.count();
- const uint32_t tau = AVALANCHE_STATISTICS_TIME_CONSTANT.count();
+ const std::vector<std::tuple<uint32_t, uint32_t, double>> testCases = {
+ // {step, tau, decay_factor}
+ {10, 100, 1. - std::exp(-1. * 10 / 100)},
+ // Current defaults
+ {AVALANCHE_STATISTICS_REFRESH_PERIOD.count(),
+ AVALANCHE_STATISTICS_TIME_CONSTANT.count(),
+ AVALANCHE_STATISTICS_DECAY_FACTOR},
+ };
+ for (const auto &[step, tau, decayFactor] : testCases) {
+ in_addr ipv4Addr;
+ ipv4Addr.s_addr = 0xa0b0c001;
+ CAddress addr = CAddress(CService(ipv4Addr, 7777), NODE_NETWORK);
+ std::unique_ptr<CNode> pnode = std::make_unique<CNode>(
+ 0, NODE_NETWORK, INVALID_SOCKET, addr, 0, 0, 0, CAddress(),
+ std::string{}, ConnectionType::OUTBOUND_FULL_RELAY, false);
+ pnode->m_avalanche_enabled = true;
+
+ double previousScore = pnode->getAvailabilityScore();
+ BOOST_CHECK_SMALL(previousScore, 1e-6);
+
+ // Check the statistics follow an exponential response for 1 to 10 tau
+ for (size_t i = 1; i <= 10; i++) {
+ for (uint32_t j = 0; j < tau; j += step) {
+ pnode->invsPolled(1);
+ // Always respond to everything correctly
+ pnode->invsVoted(1);
+
+ pnode->updateAvailabilityScore(decayFactor);
+
+ // Expect a monotonic rise
+ double currentScore = pnode->getAvailabilityScore();
+ BOOST_CHECK_GE(currentScore, previousScore);
+ previousScore = currentScore;
+ }
- in_addr ipv4Addr;
- ipv4Addr.s_addr = 0xa0b0c001;
- CAddress addr = CAddress(CService(ipv4Addr, 7777), NODE_NETWORK);
- std::unique_ptr<CNode> pnode = std::make_unique<CNode>(
- 0, NODE_NETWORK, INVALID_SOCKET, addr, 0, 0, 0, CAddress(),
- std::string{}, ConnectionType::OUTBOUND_FULL_RELAY, false);
- pnode->m_avalanche_enabled = true;
+ // We expect (1 - e^-i) after i * tau. The tolerance is expressed
+ // as a percentage, and we add a (large) 0.1% margin to account for
+ // floating point errors.
+ BOOST_CHECK_CLOSE(previousScore, -1 * std::expm1(-1. * i),
+ 100.1 / tau);
+ }
- double previousScore = pnode->getAvailabilityScore();
- BOOST_CHECK_SMALL(previousScore, 1e-6);
+ // After 10 tau we should be very close to 100% (about 99.995%)
+ BOOST_CHECK_CLOSE(previousScore, 1., 0.01);
- // Check the statistics follow an exponential response for 1 to 10 tau
- for (size_t i = 1; i <= 10; i++) {
- for (uint32_t j = 0; j < tau; j += step) {
- pnode->invsPolled(1);
- // Always respond to everything correctly
- pnode->invsVoted(1);
+ for (size_t i = 1; i <= 3; i++) {
+ for (uint32_t j = 0; j < tau; j += step) {
+ pnode->invsPolled(2);
- pnode->updateAvailabilityScore();
+ // Stop responding to the polls.
+ pnode->invsVoted(1);
- // Expect a monotonic rise
- double currentScore = pnode->getAvailabilityScore();
- BOOST_CHECK_GE(currentScore, previousScore);
- previousScore = currentScore;
- }
+ pnode->updateAvailabilityScore(decayFactor);
- // We expect (1 - e^-i) after i * tau. The tolerance is expressed
- // as a percentage, and we add a (large) 0.1% margin to account for
- // floating point errors.
- BOOST_CHECK_CLOSE(previousScore, -1 * std::expm1(-1. * i), 100.1 / tau);
- }
+ // Expect a monotonic fall
+ double currentScore = pnode->getAvailabilityScore();
+ BOOST_CHECK_LE(currentScore, previousScore);
+ previousScore = currentScore;
+ }
+
+ // There is a slight error in the expected value because we did not
+ // start the decay at exactly 100%, but the 0.1% margin is at least
+ // an order of magnitude larger than the expected error so it
+ // doesn't matter.
+ BOOST_CHECK_CLOSE(previousScore, 1. + std::expm1(-1. * i),
+ 100.1 / tau);
+ }
- // After 10 tau we should be very close to 100% (about 99.995%)
- BOOST_CHECK_CLOSE(previousScore, 1., 0.01);
+ // After 3 more tau we should be under 5%
+ BOOST_CHECK_LT(previousScore, .05);
- for (size_t i = 1; i <= 3; i++) {
- for (uint32_t j = 0; j < tau; j += step) {
- pnode->invsPolled(2);
+ for (size_t i = 1; i <= 100; i++) {
+ pnode->invsPolled(10);
- // Stop responding to the polls.
- pnode->invsVoted(1);
+ // Completely stop responding to the polls.
+ pnode->invsVoted(0);
- pnode->updateAvailabilityScore();
+ pnode->updateAvailabilityScore(decayFactor);
- // Expect a monotonic fall
+ // It's still a monotonic fall, and the score should turn negative.
double currentScore = pnode->getAvailabilityScore();
BOOST_CHECK_LE(currentScore, previousScore);
+ BOOST_CHECK_LE(currentScore, 0.);
previousScore = currentScore;
}
-
- // There is a slight error in the expected value because we did not
- // start the decay at exactly 100%, but the 0.1% margin is at least an
- // order of magnitude larger than the expected error so it doesn't
- // matter.
- BOOST_CHECK_CLOSE(previousScore, 1. + std::expm1(-1. * i), 100.1 / tau);
- }
-
- // After 3 more tau we should be under 5%
- BOOST_CHECK_LT(previousScore, .05);
-
- for (size_t i = 1; i <= 100; i++) {
- pnode->invsPolled(10);
-
- // Completely stop responding to the polls.
- pnode->invsVoted(0);
-
- pnode->updateAvailabilityScore();
-
- // It's still a monotonic fall, and the score should turn negative.
- double currentScore = pnode->getAvailabilityScore();
- BOOST_CHECK_LE(currentScore, previousScore);
- BOOST_CHECK_LE(currentScore, 0.);
- previousScore = currentScore;
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Apr 26, 10:39 (3 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5573313
Default Alt Text
D13004.diff (8 KB)
Attached To
D13004: [avalanche] Improve test coverage of availability scoring
Event Timeline
Log In to Comment