Skip to content

Commit bb3b980

Browse files
committed
validation: drop maximum -dbcache
Fixes bitcoin#28249
1 parent 327f08b commit bb3b980

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

Diff for: doc/release-notes-28358.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Updated settings
2+
------
3+
4+
- The maximum allowed value for the `-dbcache` configuration option has been
5+
dropped due to recent UTXO set growth. Note that before this change, large `-dbcache`
6+
values were automatically reduced to 16 GiB (1 GiB on 32 bit systems). (#28358)

Diff for: src/init.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ void SetupServerArgs(ArgsManager& argsman)
474474
argsman.AddArg("-conf=<file>", strprintf("Specify path to read-only configuration file. Relative paths will be prefixed by datadir location (only useable from command line, not configuration file) (default: %s)", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
475475
argsman.AddArg("-datadir=<dir>", "Specify data directory", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
476476
argsman.AddArg("-dbbatchsize", strprintf("Maximum database write batch size in bytes (default: %u)", nDefaultDbBatchSize), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS);
477-
argsman.AddArg("-dbcache=<n>", strprintf("Maximum database cache size <n> MiB (%d to %d, default: %d). In addition, unused mempool memory is shared for this cache (see -maxmempool).", nMinDbCache, nMaxDbCache, nDefaultDbCache), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
477+
argsman.AddArg("-dbcache=<n>", strprintf("Maximum database cache size <n> MiB (minimum %d, default: %d). Make sure you have enough RAM. In addition, unused memory allocated to the mempool is shared with this cache (see -maxmempool).", nMinDbCache, nDefaultDbCache), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
478478
argsman.AddArg("-includeconf=<file>", "Specify additional configuration file, relative to the -datadir path (only useable from configuration file, not command line)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
479479
argsman.AddArg("-allowignoredconf", strprintf("For backwards compatibility, treat an unused %s file in the datadir as a warning, not an error.", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
480480
argsman.AddArg("-loadblock=<file>", "Imports blocks from external file on startup", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);

Diff for: src/node/caches.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ CacheSizes CalculateCacheSizes(const ArgsManager& args, size_t n_indexes)
1313
{
1414
int64_t nTotalCache = (args.GetIntArg("-dbcache", nDefaultDbCache) << 20);
1515
nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
16-
nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greater than nMaxDbcache
1716
CacheSizes sizes;
1817
sizes.block_tree_db = std::min(nTotalCache / 8, nMaxBlockDBCache << 20);
1918
nTotalCache -= sizes.block_tree_db;

Diff for: src/qt/forms/optionsdialog.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<item>
106106
<widget class="QLabel" name="databaseCacheLabel">
107107
<property name="toolTip">
108-
<string extracomment="Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.">Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</string>
108+
<string extracomment="Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.">Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</string>
109109
</property>
110110
<property name="text">
111111
<string>Size of &amp;database cache</string>

Diff for: src/qt/optionsdialog.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet)
9393
ui->setupUi(this);
9494

9595
/* Main elements init */
96-
ui->databaseCache->setMinimum(nMinDbCache);
97-
ui->databaseCache->setMaximum(nMaxDbCache);
96+
ui->databaseCache->setRange(nMinDbCache, std::numeric_limits<int>::max());
9897
ui->threadsScriptVerif->setMinimum(-GetNumCores());
9998
ui->threadsScriptVerif->setMaximum(MAX_SCRIPTCHECK_THREADS);
10099
ui->pruneWarning->setVisible(false);

Diff for: src/txdb.h

-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ class uint256;
2525
static const int64_t nDefaultDbCache = 450;
2626
//! -dbbatchsize default (bytes)
2727
static const int64_t nDefaultDbBatchSize = 16 << 20;
28-
//! max. -dbcache (MiB)
29-
static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 16384 : 1024;
3028
//! min. -dbcache (MiB)
3129
static const int64_t nMinDbCache = 4;
3230
//! Max memory allocated to block tree DB specific cache, if no -txindex (MiB)

0 commit comments

Comments
 (0)