Fix -loadblock after partial IBD and init after kill -9 #5173

pull TheBlueMatt wants to merge 3 commits into bitcoin:master from TheBlueMatt:loadandimport changing 1 files +7 −3

TheBlueMatt commented at 2:13 AM on October 30, 2014: member

You can currently kill -9 during IBD and will not be able to restart. Also, if you let IBD start and then try to -loadblock afterwards it will not connect any of the blocks.
Fix for crash during block download 4ead850fe5
Fix -loadblock after shutdown during IBD 8375e2215f
Be a bit more verbose during -loadblock if we already have blocks 50b43fda08
sipa commented at 2:59 AM on October 30, 2014: member

utACK; thanks for investigating!
laanwj added the label Bug on Oct 30, 2014

in src/main.cpp:None in 50b43fda08

3142 |                      if (ProcessBlock(state, NULL, &block, dbp))
3143 |                          nLoaded++;
3144 |                      if (state.IsError())
3145 |                          break;
3146 | +                } else if (hash != Params().HashGenesisBlock() && mapBlockIndex[hash]->nHeight % 1000 == 0) {
3147 | +                    LogPrintf("Block Import: already had block %s at height %d\n", hash.ToString(), mapBlockIndex[hash]->nHeight);

Diapolo commented at 8:36 AM on October 30, 2014:

Nit: Indentation

TheBlueMatt commented at 7:10 PM on October 30, 2014:

Huh? Indentation is right.

Diapolo commented at 10:20 AM on November 5, 2014:

Indeed, well fine :).

laanwj commented at 9:13 AM on November 3, 2014: member

utACK
laanwj merged this on Nov 5, 2014
laanwj closed this on Nov 5, 2014
laanwj referenced this in commit 0778333b8c on Nov 5, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels