Skip to content

Add progress logging to claimtrie loading and validation. #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pseudoscalar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add progress logging to claimtrie loading and validation. #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions src/claimtrie.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,15 +442,25 @@ uint256 recursiveMerkleHash(TIterator& it, const iCbType<TIterator>& process)
bool CClaimTrieCacheBase::recursiveCheckConsistency(CClaimTrie::const_iterator& it, std::string& failed) const
{
struct CRecursiveBreak {};
int nodesVisited = 0;
int reportDone = 0;
using iterator = CClaimTrie::const_iterator;
iCbType<iterator> process = [&failed, &process](iterator& it) {
iCbType<iterator> process = [this, &reportDone, &nodesVisited, &failed, &process](iterator& it) {
int percentageDone = std::max(1, std::min(99, (int)((double)nodesVisited / (double)base->height() * 100)));
if (reportDone < percentageDone/10) {
// report every 10% step
LogPrintf("[%d%%]...", percentageDone); /* Continued */
reportDone = percentageDone/10;
}
nodesVisited++;
if (it->hash.IsNull() || it->hash != recursiveMerkleHash(it, process)) {
failed = it.key();
throw CRecursiveBreak();
}
};

try {
LogPrintf("[0%%]..."); /* Continued */
process(it);
} catch (const CRecursiveBreak&) {
return false;
Expand Down Expand Up @@ -576,11 +586,28 @@ bool CClaimTrieCacheBase::ReadFromDisk(const CBlockIndex* tip)
base->clear();
boost::scoped_ptr<CDBIterator> pcursor(base->db->NewIterator());

LogPrintf("[0%%]..."); /* Continued */
int totalRecords = 0;
for (pcursor->SeekToFirst(); pcursor->Valid(); pcursor->Next()) {
totalRecords++;
}

int reportDone = 0;
int recordsDone = 0;
int totalNodes = 0;
for (pcursor->SeekToFirst(); pcursor->Valid(); recordsDone++, pcursor->Next()) {
int percentageDone = std::max(1, std::min(99, (int)((double)recordsDone / (double)totalRecords * 50)));
if (reportDone < percentageDone/10) {
// report every 10% step
LogPrintf("[%d%%]...", percentageDone); /* Continued */
reportDone = percentageDone/10;
}
std::pair<uint8_t, std::string> key;
if (!pcursor->GetKey(key) || key.first != TRIE_NODE)
continue;

totalNodes++;

CClaimTrieData data;
if (pcursor->GetValue(data)) {
if (data.empty()) {
Expand All @@ -599,7 +626,16 @@ bool CClaimTrieCacheBase::ReadFromDisk(const CBlockIndex* tip)
}
}

for (pcursor->SeekToFirst(); pcursor->Valid(); pcursor->Next()) {
reportDone = 0;
recordsDone = 0;
LogPrintf("[50%%]..."); /* Continued */
for (pcursor->SeekToFirst(); pcursor->Valid(); recordsDone++, pcursor->Next()) {
int percentageDone = std::max(1, std::min(99, (int)((double)recordsDone / (double)totalRecords * 50)));
if (reportDone < percentageDone/10) {
// report every 10% step
LogPrintf("[%d%%]...", 50+percentageDone); /* Continued */
reportDone = percentageDone/10;
}
std::pair<uint8_t, std::string> key;
if (!pcursor->GetKey(key) || key.first != TRIE_NODE)
continue;
Expand All @@ -613,8 +649,9 @@ bool CClaimTrieCacheBase::ReadFromDisk(const CBlockIndex* tip)
base->db->Erase(key); // this uses a lot of memory and it's 1-time upgrade from 12.4 so we aren't going to batch it
}
}
LogPrintf("[Done].\n");

LogPrintf("Checking claim trie consistency... ");
LogPrintf("Checking claim trie consistency... \n");
if (checkConsistency()) {
LogPrintf("consistent\n");
if (tip && tip->hashClaimTrie != getMerkleHash())
Expand Down
12 changes: 11 additions & 1 deletion src/claimtrieforks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,17 @@ bool CClaimTrieCacheHashFork::recursiveCheckConsistency(CClaimTrie::const_iterat
return CClaimTrieCacheNormalizationFork::recursiveCheckConsistency(it, failed);

struct CRecursiveBreak {};
int nodesVisited = 0;
int reportDone = 0;
using iterator = CClaimTrie::const_iterator;
iCbType<iterator> process = [&failed, &process](iterator& it) -> uint256 {
iCbType<iterator> process = [this, &reportDone, &nodesVisited, &failed, &process](iterator& it) -> uint256 {
int percentageDone = std::max(1, std::min(99, (int)((double)nodesVisited / (double)base->height() * 100)));
if (reportDone < percentageDone/10) {
// report every 10% step
LogPrintf("[%d%%]...", percentageDone); /* Continued */
reportDone = percentageDone/10;
}
nodesVisited++;
if (it->hash.IsNull() || it->hash != recursiveBinaryTreeHash(it, process)) {
failed = it.key();
throw CRecursiveBreak();
Expand All @@ -322,6 +331,7 @@ bool CClaimTrieCacheHashFork::recursiveCheckConsistency(CClaimTrie::const_iterat
};

try {
LogPrintf("[0%%]..."); /* Continued */
process(it);
} catch (const CRecursiveBreak&) {
return false;
Expand Down