Add BlockManager::GetPruneTarget()

MarcoFalke · MarcoFalke · commit fae71fe27ec0 · 2023-01-16T17:16:30.000+01:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -1617,8 +1617,10 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     // On first startup, warn on low block storage space
     if (!fReindex && !fReindexChainState && chain_active_height <= 1) {
-        uint64_t additional_bytes_needed = fPruneMode ? nPruneTarget
-            : chainparams.AssumedBlockchainSize() * 1024 * 1024 * 1024;
+        uint64_t additional_bytes_needed{
+            fPruneMode ?
+                chainman.m_blockman.GetPruneTarget() :
+                chainparams.AssumedBlockchainSize() * 1024 * 1024 * 1024};
 
         if (!CheckDiskSpace(args.GetBlocksDirPath(), additional_bytes_needed)) {
             InitWarning(strprintf(_(
diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h
@@ -51,7 +51,6 @@ extern std::atomic_bool fReindex;
 /** Pruning-related variables and constants */
 /** True if we're running in -prune mode. */
 extern bool fPruneMode;
-/** Number of bytes of block files that we're trying to stay below. */
 extern uint64_t nPruneTarget;
 
 // Because validation code takes pointers to the map's CBlockIndex objects, if
@@ -176,6 +175,9 @@ class BlockManager
     /** Store block on disk. If dbp is not nullptr, then it provides the known position of the block within a block file on disk. */
     FlatFilePos SaveBlockToDisk(const CBlock& block, int nHeight, CChain& active_chain, const CChainParams& chainparams, const FlatFilePos* dbp);
 
+    /** Attempt to stay below this number of bytes of block files. */
+    [[nodiscard]] uint64_t GetPruneTarget() const { return nPruneTarget; }
+
     [[nodiscard]] bool LoadingBlocks() const
     {
         return fImporting || fReindex;
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
@@ -44,10 +44,10 @@ ChainstateLoadResult LoadChainstate(ChainstateManager& chainman, const CacheSize
     if (chainman.MinimumChainWork() < UintToArith256(chainman.GetConsensus().nMinimumChainWork)) {
         LogPrintf("Warning: nMinimumChainWork set below default value of %s\n", chainman.GetConsensus().nMinimumChainWork.GetHex());
     }
-    if (nPruneTarget == std::numeric_limits<uint64_t>::max()) {
+    if (chainman.m_blockman.GetPruneTarget() == std::numeric_limits<uint64_t>::max()) {
         LogPrintf("Block pruning enabled.  Use RPC call pruneblockchain(height) to manually prune block and undo files.\n");
-    } else if (nPruneTarget) {
-        LogPrintf("Prune configured to target %u MiB on disk for block and undo files.\n", nPruneTarget / 1024 / 1024);
+    } else if (chainman.m_blockman.GetPruneTarget()) {
+        LogPrintf("Prune configured to target %u MiB on disk for block and undo files.\n", chainman.m_blockman.GetPruneTarget() / 1024 / 1024);
     }
 
     LOCK(cs_main);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1273,7 +1273,7 @@ RPCHelpMan getblockchaininfo()
         bool automatic_pruning{args.GetIntArg("-prune", 0) != 1};
         obj.pushKV("automatic_pruning",  automatic_pruning);
         if (automatic_pruning) {
-            obj.pushKV("prune_target_size",  node::nPruneTarget);
+            obj.pushKV("prune_target_size", chainman.m_blockman.GetPruneTarget());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@ ChainstateLoadResult LoadChainstate(ChainstateManager& chainman, const CacheSize`
`44`	`44`	`if (chainman.MinimumChainWork() < UintToArith256(chainman.GetConsensus().nMinimumChainWork)) {`
`45`	`45`	`LogPrintf("Warning: nMinimumChainWork set below default value of %s\n", chainman.GetConsensus().nMinimumChainWork.GetHex());`
`46`	`46`	`}`
`47`		`- if (nPruneTarget == std::numeric_limits<uint64_t>::max()) {`
	`47`	`+ if (chainman.m_blockman.GetPruneTarget() == std::numeric_limits<uint64_t>::max()) {`
`48`	`48`	`LogPrintf("Block pruning enabled. Use RPC call pruneblockchain(height) to manually prune block and undo files.\n");`
`49`		`- } else if (nPruneTarget) {`
`50`		`- LogPrintf("Prune configured to target %u MiB on disk for block and undo files.\n", nPruneTarget / 1024 / 1024);`
	`49`	`+ } else if (chainman.m_blockman.GetPruneTarget()) {`
	`50`	`+ LogPrintf("Prune configured to target %u MiB on disk for block and undo files.\n", chainman.m_blockman.GetPruneTarget() / 1024 / 1024);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`LOCK(cs_main);`
Original file line number	Diff line number	Diff line change
`@@ -1273,7 +1273,7 @@ RPCHelpMan getblockchaininfo()`
`1273`	`1273`	`bool automatic_pruning{args.GetIntArg("-prune", 0) != 1};`
`1274`	`1274`	`obj.pushKV("automatic_pruning", automatic_pruning);`
`1275`	`1275`	`if (automatic_pruning) {`
`1276`		`- obj.pushKV("prune_target_size", node::nPruneTarget);`
	`1276`	`+ obj.pushKV("prune_target_size", chainman.m_blockman.GetPruneTarget());`
`1277`	`1277`	`}`
`1278`	`1278`	`}`
`1279`	`1279`