From 51cb7fd9041565d35dffbedda21f769b0d19f7f1 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 10 Jun 2025 13:38:50 +0200 Subject: [PATCH 1/3] Fix version number of metrics added as part of RocksDB upgrade --- Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml | 2 +- Documentation/Metrics/rocksdb_block_cache_entries.yaml | 2 +- Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml | 2 +- Documentation/Metrics/rocksdb_live_blob_file_size.yaml | 2 +- Documentation/Metrics/rocksdb_num_blob_files.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml b/Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml index 2bf409777ad8..5d512dc4c1fa 100644 --- a/Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml +++ b/Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml @@ -1,5 +1,5 @@ name: rocksdb_block_cache_charge_per_entry -introducedIn: "3.12.2" +introducedIn: "3.12.5" help: | Average size of entries in RocksDB block cache. unit: bytes diff --git a/Documentation/Metrics/rocksdb_block_cache_entries.yaml b/Documentation/Metrics/rocksdb_block_cache_entries.yaml index 77f495fa04c5..2bedfefa12d9 100644 --- a/Documentation/Metrics/rocksdb_block_cache_entries.yaml +++ b/Documentation/Metrics/rocksdb_block_cache_entries.yaml @@ -1,5 +1,5 @@ name: rocksdb_block_cache_entries -introducedIn: "3.12.2" +introducedIn: "3.12.5" help: | Number of entries in the RocksDB block cache. unit: number diff --git a/Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml b/Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml index 4ff13a6001c0..c4e0df35a22c 100644 --- a/Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml +++ b/Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml @@ -1,5 +1,5 @@ name: rocksdb_live_blob_file_garbage_size -introducedIn: "3.12.2" +introducedIn: "3.12.5" help: | Size of garbage in live RocksDB .blob files. unit: bytes diff --git a/Documentation/Metrics/rocksdb_live_blob_file_size.yaml b/Documentation/Metrics/rocksdb_live_blob_file_size.yaml index cab2bc2b0b4e..b65b47e29b30 100644 --- a/Documentation/Metrics/rocksdb_live_blob_file_size.yaml +++ b/Documentation/Metrics/rocksdb_live_blob_file_size.yaml @@ -1,5 +1,5 @@ name: rocksdb_live_blob_file_size -introducedIn: "3.12.2" +introducedIn: "3.12.5" help: | Size of live RocksDB .blob files. unit: bytes diff --git a/Documentation/Metrics/rocksdb_num_blob_files.yaml b/Documentation/Metrics/rocksdb_num_blob_files.yaml index 1560f54d375d..729480730e5e 100644 --- a/Documentation/Metrics/rocksdb_num_blob_files.yaml +++ b/Documentation/Metrics/rocksdb_num_blob_files.yaml @@ -1,5 +1,5 @@ name: rocksdb_num_blob_files -introducedIn: "3.12.2" +introducedIn: "3.12.5" help: | Number of live RocksDB .blob files. unit: number From 5e607b0bdd6b4363d278ce8560b9c5b42238835f Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 10 Jun 2025 13:44:19 +0200 Subject: [PATCH 2/3] Actually not in 3.12.5 branch --- Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml | 2 +- Documentation/Metrics/rocksdb_block_cache_entries.yaml | 2 +- Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml | 2 +- Documentation/Metrics/rocksdb_live_blob_file_size.yaml | 2 +- Documentation/Metrics/rocksdb_num_blob_files.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml b/Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml index 5d512dc4c1fa..d930ea7d2a2f 100644 --- a/Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml +++ b/Documentation/Metrics/rocksdb_block_cache_charge_per_entry.yaml @@ -1,5 +1,5 @@ name: rocksdb_block_cache_charge_per_entry -introducedIn: "3.12.5" +introducedIn: "3.12.6" help: | Average size of entries in RocksDB block cache. unit: bytes diff --git a/Documentation/Metrics/rocksdb_block_cache_entries.yaml b/Documentation/Metrics/rocksdb_block_cache_entries.yaml index 2bedfefa12d9..5c5f4d0ab529 100644 --- a/Documentation/Metrics/rocksdb_block_cache_entries.yaml +++ b/Documentation/Metrics/rocksdb_block_cache_entries.yaml @@ -1,5 +1,5 @@ name: rocksdb_block_cache_entries -introducedIn: "3.12.5" +introducedIn: "3.12.6" help: | Number of entries in the RocksDB block cache. unit: number diff --git a/Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml b/Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml index c4e0df35a22c..d3d9c1f93157 100644 --- a/Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml +++ b/Documentation/Metrics/rocksdb_live_blob_file_garbage_size.yaml @@ -1,5 +1,5 @@ name: rocksdb_live_blob_file_garbage_size -introducedIn: "3.12.5" +introducedIn: "3.12.6" help: | Size of garbage in live RocksDB .blob files. unit: bytes diff --git a/Documentation/Metrics/rocksdb_live_blob_file_size.yaml b/Documentation/Metrics/rocksdb_live_blob_file_size.yaml index b65b47e29b30..a181d378c513 100644 --- a/Documentation/Metrics/rocksdb_live_blob_file_size.yaml +++ b/Documentation/Metrics/rocksdb_live_blob_file_size.yaml @@ -1,5 +1,5 @@ name: rocksdb_live_blob_file_size -introducedIn: "3.12.5" +introducedIn: "3.12.6" help: | Size of live RocksDB .blob files. unit: bytes diff --git a/Documentation/Metrics/rocksdb_num_blob_files.yaml b/Documentation/Metrics/rocksdb_num_blob_files.yaml index 729480730e5e..46e6cb51e884 100644 --- a/Documentation/Metrics/rocksdb_num_blob_files.yaml +++ b/Documentation/Metrics/rocksdb_num_blob_files.yaml @@ -1,5 +1,5 @@ name: rocksdb_num_blob_files -introducedIn: "3.12.5" +introducedIn: "3.12.6" help: | Number of live RocksDB .blob files. unit: number From 3130688108f2592185af0734b1b9eebbaf130812 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Tue, 10 Jun 2025 14:50:13 +0200 Subject: [PATCH 3/3] Adjust version remarks for newly added startup options too --- arangod/RocksDBEngine/RocksDBOptionFeature.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arangod/RocksDBEngine/RocksDBOptionFeature.cpp b/arangod/RocksDBEngine/RocksDBOptionFeature.cpp index 6eebb6e0fa0a..102bf2872dd6 100644 --- a/arangod/RocksDBEngine/RocksDBOptionFeature.cpp +++ b/arangod/RocksDBEngine/RocksDBOptionFeature.cpp @@ -790,7 +790,7 @@ are stopped to allow compaction to catch up.)"); arangodb::options::Flags::OnAgent, arangodb::options::Flags::OnDBServer, arangodb::options::Flags::OnSingle)) - .setIntroducedIn(31205); + .setIntroducedIn(31206); TRI_ASSERT(::blockCacheTypes.contains(_blockCacheType)); options @@ -799,7 +799,7 @@ are stopped to allow compaction to catch up.)"); "type is experimental).", new DiscreteValuesParameter( &_blockCacheType, ::blockCacheTypes)) - .setIntroducedIn(31205); + .setIntroducedIn(31206); options ->addOption( @@ -1131,7 +1131,7 @@ downgrading.)"); arangodb::options::Flags::OnAgent, arangodb::options::Flags::OnDBServer, arangodb::options::Flags::OnSingle)) - .setIntroducedIn(31205); + .setIntroducedIn(31206); options ->addOption("--rocksdb.enable-index-compression", @@ -1169,7 +1169,7 @@ downgrading.)"); arangodb::options::Flags::OnAgent, arangodb::options::Flags::OnDBServer, arangodb::options::Flags::OnSingle)) - .setIntroducedIn(31205); + .setIntroducedIn(31206); options ->addOption("--rocksdb.min-blob-size", @@ -1209,7 +1209,7 @@ downgrading.)"); arangodb::options::Flags::OnAgent, arangodb::options::Flags::OnDBServer, arangodb::options::Flags::OnSingle)) - .setIntroducedIn(31205); + .setIntroducedIn(31206); options ->addOption( @@ -1287,7 +1287,7 @@ downgrading.)"); arangodb::options::Flags::OnAgent, arangodb::options::Flags::OnDBServer, arangodb::options::Flags::OnSingle)) - .setIntroducedIn(31205); + .setIntroducedIn(31206); options ->addOption(