validation: return VerifyDBResult::INTERRUPTED if verification was interrupted

mzumsande · mzumsande · commit d6f781f1cfcb · 2023-02-16T17:32:15.000-05:00
This means that the -verifydb RPC will now return false if it
cannot finish due to the node being shutdown.
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
@@ -193,6 +193,7 @@ ChainstateLoadResult VerifyLoadedChainstate(ChainstateManager& chainman, const C
                 options.check_blocks);
             switch (result) {
             case VerifyDBResult::SUCCESS:
+            case VerifyDBResult::INTERRUPTED:
                 break;
             case VerifyDBResult::CORRUPTED_BLOCK_DB:
                 return {ChainstateLoadStatus::FAILURE, _("Corrupted block database detected")};
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4146,7 +4146,7 @@ VerifyDBResult CVerifyDB::VerifyDB(
                 skipped_l3_checks = true;
             }
         }
-        if (ShutdownRequested()) return VerifyDBResult::SUCCESS;
+        if (ShutdownRequested()) return VerifyDBResult::INTERRUPTED;
     }
     if (pindexFailure) {
         LogPrintf("Verification error: coin database inconsistencies found (last %i blocks, %i good transactions before that)\n", chainstate.m_chain.Height() - pindexFailure->nHeight + 1, nGoodTransactions);
@@ -4179,7 +4179,7 @@ VerifyDBResult CVerifyDB::VerifyDB(
                 LogPrintf("Verification error: found unconnectable block at %d, hash=%s (%s)\n", pindex->nHeight, pindex->GetBlockHash().ToString(), state.ToString());
                 return VerifyDBResult::CORRUPTED_BLOCK_DB;
             }
-            if (ShutdownRequested()) return VerifyDBResult::SUCCESS;
+            if (ShutdownRequested()) return VerifyDBResult::INTERRUPTED;
         }
     }
 
diff --git a/src/validation.h b/src/validation.h
@@ -352,6 +352,7 @@ arith_uint256 CalculateHeadersWork(const std::vector<CBlockHeader>& headers);
 enum class VerifyDBResult {
     SUCCESS,
     CORRUPTED_BLOCK_DB,
+    INTERRUPTED,
 };
 
 /** RAII wrapper for VerifyDB: Verify consistency of the block and coin databases */

Original file line number	Diff line number	Diff line change
`@@ -4146,7 +4146,7 @@ VerifyDBResult CVerifyDB::VerifyDB(`
`4146`	`4146`	`skipped_l3_checks = true;`
`4147`	`4147`	`}`
`4148`	`4148`	`}`
`4149`		`- if (ShutdownRequested()) return VerifyDBResult::SUCCESS;`
	`4149`	`+ if (ShutdownRequested()) return VerifyDBResult::INTERRUPTED;`
`4150`	`4150`	`}`
`4151`	`4151`	`if (pindexFailure) {`
`4152`	`4152`	`LogPrintf("Verification error: coin database inconsistencies found (last %i blocks, %i good transactions before that)\n", chainstate.m_chain.Height() - pindexFailure->nHeight + 1, nGoodTransactions);`
`@@ -4179,7 +4179,7 @@ VerifyDBResult CVerifyDB::VerifyDB(`
`4179`	`4179`	`LogPrintf("Verification error: found unconnectable block at %d, hash=%s (%s)\n", pindex->nHeight, pindex->GetBlockHash().ToString(), state.ToString());`
`4180`	`4180`	`return VerifyDBResult::CORRUPTED_BLOCK_DB;`
`4181`	`4181`	`}`
`4182`		`- if (ShutdownRequested()) return VerifyDBResult::SUCCESS;`
	`4182`	`+ if (ShutdownRequested()) return VerifyDBResult::INTERRUPTED;`
`4183`	`4183`	`}`
`4184`	`4184`	`}`
`4185`	`4185`