tracking: read the ledger's version, not just write it; clear owned on any block; channel-correct prune recovery
This commit is contained in:
@@ -72,6 +72,7 @@ struct PruneScan {
|
||||
std::unordered_map<std::string, std::uint64_t> sizeByRel;
|
||||
bool blocked = false;
|
||||
bool ledgerUnreadable = false;
|
||||
bool ledgerFutureVersion = false;
|
||||
std::vector<std::string> unreadableUsageKeys;
|
||||
};
|
||||
|
||||
@@ -134,6 +135,7 @@ PruneScan scanPruneOrphans(const BankBook& book, const tracking::OriginLedger& l
|
||||
// action tell the user what to recover.
|
||||
scan.blocked = true;
|
||||
scan.ledgerUnreadable = protection.ledgerUnreadable;
|
||||
scan.ledgerFutureVersion = protection.ledgerFutureVersion;
|
||||
scan.unreadableUsageKeys = protection.unreadableUsageKeys;
|
||||
return scan;
|
||||
}
|
||||
@@ -211,6 +213,7 @@ reclaim::PruneReport ReaSamplerSession::pruneDryRun() const {
|
||||
// the prune refused to run.
|
||||
report.blockedByTracking = scan.blocked;
|
||||
report.ledgerUnreadable = scan.ledgerUnreadable;
|
||||
report.ledgerFutureVersion = scan.ledgerFutureVersion;
|
||||
report.unreadableUsageKeys = scan.unreadableUsageKeys;
|
||||
return report;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user