From ae04d46885085c9588e81ac2b09212c62cc2cc9e Mon Sep 17 00:00:00 2001 From: ahamlat Date: Fri, 24 Mar 2023 19:23:46 +0100 Subject: [PATCH] Upgrade RocksDB version from 7.7.3 to 8.0.0 (#5262) Upgrade rocksdb to 8.0.0 Remove deprecated/obsolete RocksDB statistics in version 8.0.0 Signed-off-by: Ameziane H --- CHANGELOG.md | 3 ++- gradle/verification-metadata.xml | 8 ++++++++ gradle/versions.gradle | 2 +- .../besu/metrics/rocksdb/RocksDBStats.java | 16 ---------------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56ac615976..31afabe2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ ### Additions and Improvements - An alternate build target for the EVM using GraalVM AOT compilaiton was added. [#5192](https://github.com/hyperledger/besu/pull/5192) - - To generate the binary install and use GraalVM 23.3.r17 or higher and run `./gradlew naticeCompile`. The binary will be located in `ethereum/evmtool/build/native/nativeCompile` +- To generate the binary install and use GraalVM 23.3.r17 or higher and run `./gradlew naticeCompile`. The binary will be located in `ethereum/evmtool/build/native/nativeCompile` +- Upgrade RocksDB version from 7.7.3 to 8.0.0. Besu Team [contributed](https://github.com/facebook/rocksdb/pull/11099) to this release to make disabling checksum verification work. ### Bug Fixes diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d9561d2da5..0c8b059c30 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -5551,6 +5551,14 @@ + + + + + + + + diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 3def63f94a..43cb623f37 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -191,7 +191,7 @@ dependencyManagement { dependency 'org.openjdk.jmh:jmh-core:1.34' dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.34' - dependency 'org.rocksdb:rocksdbjni:7.7.3' + dependency 'org.rocksdb:rocksdbjni:8.0.0' dependency 'org.slf4j:slf4j-api:2.0.6' dependency 'org.slf4j:slf4j-nop:2.0.6' diff --git a/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java b/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java index 1a00df34ca..01e7aca7a3 100644 --- a/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java +++ b/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java @@ -51,12 +51,10 @@ public class RocksDBStats { TickerType.BLOCK_CACHE_INDEX_HIT, TickerType.BLOCK_CACHE_INDEX_ADD, TickerType.BLOCK_CACHE_INDEX_BYTES_INSERT, - TickerType.BLOCK_CACHE_INDEX_BYTES_EVICT, TickerType.BLOCK_CACHE_FILTER_MISS, TickerType.BLOCK_CACHE_FILTER_HIT, TickerType.BLOCK_CACHE_FILTER_ADD, TickerType.BLOCK_CACHE_FILTER_BYTES_INSERT, - TickerType.BLOCK_CACHE_FILTER_BYTES_EVICT, TickerType.BLOCK_CACHE_DATA_MISS, TickerType.BLOCK_CACHE_DATA_HIT, TickerType.BLOCK_CACHE_DATA_ADD, @@ -90,7 +88,6 @@ public class RocksDBStats { TickerType.NUMBER_DB_NEXT_FOUND, TickerType.NUMBER_DB_PREV_FOUND, TickerType.ITER_BYTES_READ, - TickerType.NO_FILE_CLOSES, TickerType.NO_FILE_OPENS, TickerType.NO_FILE_ERRORS, // TickerType.STALL_L0_SLOWDOWN_MICROS, @@ -98,26 +95,18 @@ public class RocksDBStats { // TickerType.STALL_L0_NUM_FILES_MICROS, TickerType.STALL_MICROS, TickerType.DB_MUTEX_WAIT_MICROS, - TickerType.RATE_LIMIT_DELAY_MILLIS, - TickerType.NO_ITERATORS, TickerType.NUMBER_MULTIGET_BYTES_READ, TickerType.NUMBER_MULTIGET_KEYS_READ, TickerType.NUMBER_MULTIGET_CALLS, - TickerType.NUMBER_FILTERED_DELETES, TickerType.NUMBER_MERGE_FAILURES, TickerType.BLOOM_FILTER_PREFIX_CHECKED, TickerType.BLOOM_FILTER_PREFIX_USEFUL, TickerType.NUMBER_OF_RESEEKS_IN_ITERATION, TickerType.GET_UPDATES_SINCE_CALLS, - TickerType.BLOCK_CACHE_COMPRESSED_MISS, - TickerType.BLOCK_CACHE_COMPRESSED_HIT, - TickerType.BLOCK_CACHE_COMPRESSED_ADD, - TickerType.BLOCK_CACHE_COMPRESSED_ADD_FAILURES, TickerType.WAL_FILE_SYNCED, TickerType.WAL_FILE_BYTES, TickerType.WRITE_DONE_BY_SELF, TickerType.WRITE_DONE_BY_OTHER, - TickerType.WRITE_TIMEDOUT, TickerType.WRITE_WITH_WAL, TickerType.COMPACT_READ_BYTES, TickerType.COMPACT_WRITE_BYTES, @@ -156,11 +145,6 @@ public class RocksDBStats { HistogramType.READ_BLOCK_COMPACTION_MICROS, HistogramType.READ_BLOCK_GET_MICROS, HistogramType.WRITE_RAW_BLOCK_MICROS, - HistogramType.STALL_L0_SLOWDOWN_COUNT, - HistogramType.STALL_MEMTABLE_COMPACTION_COUNT, - HistogramType.STALL_L0_NUM_FILES_COUNT, - HistogramType.HARD_RATE_LIMIT_DELAY_COUNT, - HistogramType.SOFT_RATE_LIMIT_DELAY_COUNT, HistogramType.NUM_FILES_IN_SINGLE_COMPACTION, HistogramType.DB_SEEK, HistogramType.WRITE_STALL,