ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve crawl shard resource usage

Browse Source
This commit is contained in:
Miguel Portilla
2018-12-10 15:48:20 -05:00
committed by Nik Bougalis
parent 96c949a997
commit 1be8094ee2
3 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ripple/nodestore/DatabaseShard.h
View File

@@ -211,6 +211,14 @@ public:
static constexpr std::uint32_t ledgersPerShardDefault {16384u};
};
constexpr
std::uint32_t
seqToShardIndex(std::uint32_t seq,
std::uint32_t ledgersPerShard = DatabaseShard::ledgersPerShardDefault)
{
return (seq - 1) / ledgersPerShard;
}
}
}

2
src/ripple/nodestore/impl/DatabaseShardImp.h
View File

@@ -89,7 +89,7 @@ public:
seqToShardIndex(std::uint32_t seq) const override
{
assert(seq >= earliestSeq());
return (seq - 1) / ledgersPerShard_;
return NodeStore::seqToShardIndex(seq, ledgersPerShard_);
}
std::uint32_t

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

@@ -1119,36 +1119,78 @@ PeerImp::onMessage(std::shared_ptr <protocol::TMShardInfo> const& m)
// Parse the shard indexes received in the shard info
RangeSet<std::uint32_t> shardIndexes;
{
std::vector<std::string> tokens;
boost::split(tokens, m->shardindexes(), boost::algorithm::is_any_of(","));
for (auto const& t : tokens)
std::uint32_t earliestShard;
boost::optional<std::uint32_t> latestShard;
{
std::vector<std::string> seqs;
boost::split(seqs, t, boost::algorithm::is_any_of("-"));
if (seqs.empty() || seqs.size() > 2)
auto const curLedgerSeq {
app_.getLedgerMaster().getCurrentLedgerIndex()};
if (auto shardStore = app_.getShardStore())
{
fee_ = Resource::feeBadData;
return;
earliestShard = shardStore->earliestShardIndex();
if (curLedgerSeq >= shardStore->earliestSeq())
latestShard = shardStore->seqToShardIndex(curLedgerSeq);
}
std::uint32_t first;
if (!beast::lexicalCastChecked(first, seqs.front()))
{
fee_ = Resource::feeBadData;
return;
}
if (seqs.size() == 1)
shardIndexes.insert(first);
else
{
std::uint32_t second;
if (!beast::lexicalCastChecked(second, seqs.back()))
{
fee_ = Resource::feeBadData;
auto const earliestSeq {app_.getNodeStore().earliestSeq()};
earliestShard = NodeStore::seqToShardIndex(earliestSeq);
if (curLedgerSeq >= earliestSeq)
latestShard = NodeStore::seqToShardIndex(curLedgerSeq);
}
}
auto getIndex = [this, &earliestShard, &latestShard]
(std::string const& s) -> boost::optional<std::uint32_t>
{
std::uint32_t shardIndex;
if (!beast::lexicalCastChecked(shardIndex, s))
{
fee_ = Resource::feeBadData;
return boost::none;
}
if (shardIndex < earliestShard ||
(latestShard && shardIndex > latestShard))
{
fee_ = Resource::feeBadData;
JLOG(p_journal_.error()) <<
"Invalid shard index " << shardIndex;
return boost::none;
}
return shardIndex;
};
std::vector<std::string> tokens;
boost::split(tokens, m->shardindexes(),
boost::algorithm::is_any_of(","));
std::vector<std::string> indexes;
for (auto const& t : tokens)
{
indexes.clear();
boost::split(indexes, t, boost::algorithm::is_any_of("-"));
switch (indexes.size())
{
case 1:
{
auto const first {getIndex(indexes.front())};
if (!first)
return;
}
shardIndexes.insert(range(first, second));
shardIndexes.insert(*first);
break;
}
case 2:
{
auto const first {getIndex(indexes.front())};
if (!first)
return;
auto const second {getIndex(indexes.back())};
if (!second)
return;
shardIndexes.insert(range(*first, *second));
break;
}
default:
fee_ = Resource::feeBadData;
return;
}
}
}