ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve the server's PING/PONG logic

Browse Source
This commit is contained in:
Crypto Brad Garlinghouse
2018-12-27 21:16:06 +00:00
committed by Nik Bougalis
parent 8d59ed5b2a
commit cd820b3777
3 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/ripple/overlay/impl/PeerImp.cpp
View File

@@ -291,14 +291,9 @@ PeerImp::json()
}
{
std::chrono::milliseconds latency;
{
std::lock_guard<std::mutex> sl (recentLock_);
latency = latency_;
}
if (latency != std::chrono::milliseconds (-1))
ret[jss::latency] = static_cast<Json::UInt> (latency.count());
std::lock_guard<std::mutex> sl (recentLock_);
if (latency_)
ret[jss::latency] = static_cast<Json::UInt> (latency_->count());
}
ret[jss::uptime] = static_cast<Json::UInt>(
@@ -582,25 +577,24 @@ PeerImp::onTimer (error_code const& ec)
return;
}
if (lastPingSeq_ == 0)
if (!lastPingSeq_)
{
// Make sequence unpredictable enough that a peer
// can't fake their latency
lastPingSeq_ = rand_int (65535);
// Make the sequence unpredictable enough to prevent guessing
lastPingSeq_ = rand_int<std::uint32_t>();
lastPingTime_ = clock_type::now();
protocol::TMPing message;
message.set_type (protocol::TMPing::ptPING);
message.set_seq (lastPingSeq_);
message.set_seq (*lastPingSeq_);
send (std::make_shared<Message> (
message, protocol::mtPING));
send (std::make_shared<Message> (message, protocol::mtPING));
}
else
{
// We have an outstanding ping, raise latency
auto minLatency = std::chrono::duration_cast <std::chrono::milliseconds>
(clock_type::now() - lastPingTime_);
auto const minLatency =
std::chrono::duration_cast<std::chrono::milliseconds>
(clock_type::now() - lastPingTime_);
std::lock_guard<std::mutex> sl(recentLock_);
@@ -908,30 +902,33 @@ PeerImp::onMessage (std::shared_ptr <protocol::TMPing> const& m)
fee_ = Resource::feeMediumBurdenPeer;
m->set_type (protocol::TMPing::ptPONG);
send (std::make_shared<Message> (*m, protocol::mtPING));
return;
}
if ((m->type () == protocol::TMPing::ptPONG) && m->has_seq ())
if (m->type () == protocol::TMPing::ptPONG)
{
// We have received a pong, update our latency estimate
auto unknownLatency = std::chrono::milliseconds (-1);
std::lock_guard<std::mutex> sl(recentLock_);
if ((lastPingSeq_ != 0) && (m->seq () == lastPingSeq_))
if (m->has_seq() && m->seq() == lastPingSeq_)
{
no_ping_ = 0;
auto estimate = std::chrono::duration_cast <std::chrono::milliseconds>
(clock_type::now() - lastPingTime_);
if (latency_ == unknownLatency)
latency_ = estimate;
// Only reset the ping sequence if we actually received a
// PONG with the correct cookie. That way, any peers which
// respond with incorrect cookies will eventually time out.
lastPingSeq_.reset();
// Update latency estimate
std::lock_guard<std::mutex> sl(recentLock_);
auto const estimate =
std::chrono::duration_cast<std::chrono::milliseconds>
(clock_type::now() - lastPingTime_);
// Calculate the cumulative moving average of the latency:
if (latency_)
latency_ = (*latency_ * 7 + estimate) / 8;
else
latency_ = (latency_ * 7 + estimate) / 8;
latency_ = estimate;
}
else
latency_ = unknownLatency;
lastPingSeq_ = 0;
return;
}
@@ -2701,14 +2698,14 @@ PeerImp::getScore (bool haveItem) const
if (haveItem)
score += spHaveItem;
std::chrono::milliseconds latency;
boost::optional<std::chrono::milliseconds> latency;
{
std::lock_guard<std::mutex> sl (recentLock_);
latency = latency_;
}
if (latency != std::chrono::milliseconds (-1))
score -= latency.count() * spLatency;
if (latency)
score -= latency->count() * spLatency;
else
score -= spNoLatency;
@@ -2719,7 +2716,7 @@ bool
PeerImp::isHighLatency() const
{
std::lock_guard<std::mutex> sl (recentLock_);
return latency_.count() >= Tuning::peerHighLatency;
return latency_ >= Tuning::peerHighLatency;
}
} // ripple