mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-22 00:00:55 +01:00
Do not allow blockfile pruning during reindex.
Also clarify startup message.
Github-Pull: #6856
Rebased-From: d3b09f6bac
This commit is contained in:
committed by
Wladimir J. van der Laan
parent
fc7f0ee28c
commit
dfe55bdc32
@@ -1369,10 +1369,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||
// if pruning, unset the service bit and perform the initial blockstore prune
|
||||
// after any wallet rescanning has taken place.
|
||||
if (fPruneMode) {
|
||||
uiInterface.InitMessage(_("Pruning blockstore..."));
|
||||
LogPrintf("Unsetting NODE_NETWORK on prune mode\n");
|
||||
nLocalServices &= ~NODE_NETWORK;
|
||||
if (!fReindex) {
|
||||
uiInterface.InitMessage(_("Pruning blockstore..."));
|
||||
PruneAndFlush();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2000,7 +2000,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
|
||||
std::set<int> setFilesToPrune;
|
||||
bool fFlushForPrune = false;
|
||||
try {
|
||||
if (fPruneMode && fCheckForPruning) {
|
||||
if (fPruneMode && fCheckForPruning && !fReindex) {
|
||||
FindFilesToPrune(setFilesToPrune);
|
||||
fCheckForPruning = false;
|
||||
if (!setFilesToPrune.empty()) {
|
||||
|
||||
Reference in New Issue
Block a user