Skip to content

[Core] Add reindex-chainstate startup option #1907

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

Closed
random-zebra wants to merge 1 commit into from
Closed

[Core] Add reindex-chainstate startup option #1907

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
6 changes: 4 additions & 2 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ std::string HelpMessage(HelpMessageMode mode)
#ifndef WIN32
strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), PIVX_PID_FILENAME));
#endif
strUsage += HelpMessageOpt("-reindex-chainstate", _("Rebuild chain state from the currently indexed blocks"));
strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup"));
strUsage += HelpMessageOpt("-resync", _("Delete blockchain folders and resync from scratch") + " " + _("on startup"));
#if !defined(WIN32)
Expand Down Expand Up @@ -1456,6 +1457,7 @@ bool AppInit2()
// ********************************************************* Step 7: load block chain

fReindex = GetBoolArg("-reindex", false);
bool fReindexChainState = GetBoolArg("-reindex-chainstate", false);

// Create blocks directory if it doesn't already exist
fs::create_directories(GetDataDir() / "blocks");
Expand Down Expand Up @@ -1498,7 +1500,7 @@ bool AppInit2()
pSporkDB = new CSporkDB(0, false, false);

pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex);
pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex || fReindexChainState);
pcoinscatcher = new CCoinsViewErrorCatcher(pcoinsdbview);
pcoinsTip = new CCoinsViewCache(pcoinscatcher);

Expand Down Expand Up @@ -1544,7 +1546,7 @@ bool AppInit2()

// Check for changed -txindex state
if (fTxIndex != GetBoolArg("-txindex", DEFAULT_TXINDEX)) {
strLoadError = _("You need to rebuild the database using -reindex to change -txindex");
strLoadError = _("You need to rebuild the database using -reindex-chainstate to change -txindex");
break;
}

Expand Down
12 changes: 9 additions & 3 deletions test/functional/feature_reindex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,25 @@ def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1

def reindex(self):
def reindex(self, justchainstate=False):
self.nodes[0].generate(3)
blockcount = self.nodes[0].getblockcount()
self.stop_nodes()
self.log.info("Stopping node...")
time.sleep(5)
extra_args = [["-reindex", "-checkblockindex=1"]]
extra_args = [["-reindex-chainstate" if justchainstate else "-reindex", "-checkblockindex=1"]]
self.log.info("Reindexing %s [block count: %d]" % (
"chainstate" if justchainstate else "blocks", blockcount))
self.start_nodes(extra_args)
time.sleep(15)
wait_until(lambda: self.nodes[0].getblockcount() == blockcount)
self.log.info("Success")

def run_test(self):
self.reindex()
self.reindex(False)
self.reindex(True)
self.reindex(False)
self.reindex(True)

if __name__ == '__main__':
ReindexTest().main()
2 changes: 1 addition & 1 deletion test/functional/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@

# vv Tests less than 5m vv
'wallet_zapwallettxes.py', # ~ 300 sec
'feature_reindex.py', # ~ 290 sec
'p2p_time_offset.py', # ~ 267 sec
'rpc_fundrawtransaction.py', # ~ 260 sec
'mining_pos_coldStaking.py', # ~ 215 sec
Expand All @@ -84,7 +85,6 @@
'p2p_disconnect_ban.py', # ~ 118 sec
'wallet_listreceivedby.py', # ~ 117 sec
'mining_pos_fakestake.py', # ~ 113 sec
'feature_reindex.py', # ~ 110 sec
'interface_http.py', # ~ 105 sec
'wallet_listtransactions.py', # ~ 97 sec
'mempool_reorg.py', # ~ 92 sec
Expand Down