neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not allow blockfile pruning during reindex.

Browse Source 
Also clarify startup message.
This commit is contained in:
Alex Morcos 2015-10-19 14:43:04 -04:00
parent da7d57fb95
commit d3b09f6bac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@ -1498,10 +1498,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// if pruning, unset the service bit and perform the initial blockstore prune // if pruning, unset the service bit and perform the initial blockstore prune
// after any wallet rescanning has taken place. // after any wallet rescanning has taken place.
if (fPruneMode) { if (fPruneMode) {
uiInterface.InitMessage(_("Pruning blockstore..."));
LogPrintf("Unsetting NODE_NETWORK on prune mode\n"); LogPrintf("Unsetting NODE_NETWORK on prune mode\n");
nLocalServices &= ~NODE_NETWORK; nLocalServices &= ~NODE_NETWORK;
if (!fReindex) { if (!fReindex) {
uiInterface.InitMessage(_("Pruning blockstore..."));
PruneAndFlush(); PruneAndFlush();
} }
} }

2
src/main.cpp
View File

@ -1881,7 +1881,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
std::set<int> setFilesToPrune; std::set<int> setFilesToPrune;
bool fFlushForPrune = false; bool fFlushForPrune = false;
try { try {
if (fPruneMode && fCheckForPruning) { if (fPruneMode && fCheckForPruning && !fReindex) {
FindFilesToPrune(setFilesToPrune); FindFilesToPrune(setFilesToPrune);
fCheckForPruning = false; fCheckForPruning = false;
if (!setFilesToPrune.empty()) { if (!setFilesToPrune.empty()) {