This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.17 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit a57438171fcb61b95d1c978894464e52e22dcfdb Author: Lari Hotari <[email protected]> AuthorDate: Fri Aug 16 13:43:31 2024 +0300 Set default format_version to 5 for RocksDB databases (#4480) (cherry picked from commit 8c7dea6503a635707e36f4392ddfc44d2ccb9b54) --- .../apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java | 2 +- bookkeeper-server/src/test/resources/conf/default_rocksdb.conf | 4 +++- bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf | 2 +- .../src/test/resources/conf/ledger_metadata_rocksdb.conf | 4 +++- bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf | 2 +- conf/bk_server.conf | 2 +- conf/default_rocksdb.conf.default | 2 ++ conf/entry_location_rocksdb.conf.default | 2 +- conf/ledger_metadata_rocksdb.conf.default | 2 ++ 9 files changed, 15 insertions(+), 7 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java index a77a0a18f7..0c13c1c8bf 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java @@ -198,7 +198,7 @@ public class KeyValueStorageRocksDB implements KeyValueStorage { int blockSize = conf.getInt(ROCKSDB_BLOCK_SIZE, 64 * 1024); int bloomFilterBitsPerKey = conf.getInt(ROCKSDB_BLOOM_FILTERS_BITS_PER_KEY, 10); boolean lz4CompressionEnabled = conf.getBoolean(ROCKSDB_LZ4_COMPRESSION_ENABLED, true); - int formatVersion = conf.getInt(ROCKSDB_FORMAT_VERSION, 2); + int formatVersion = conf.getInt(ROCKSDB_FORMAT_VERSION, 5); if (lz4CompressionEnabled) { options.setCompressionType(CompressionType.LZ4_COMPRESSION); diff --git a/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf index 0f3a08779e..2dbecf36c3 100644 --- a/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf @@ -26,4 +26,6 @@ [CFOptions "default"] # set by jni: options.setLogFileTimeToRoll - log_file_time_to_roll=86400 \ No newline at end of file + log_file_time_to_roll=86400 + # set by jni: tableOptions.setFormatVersion + format_version=5 \ No newline at end of file diff --git a/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf index 6f6c1b4d05..0ccc7cb37a 100644 --- a/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/entry_location_rocksdb.conf @@ -60,7 +60,7 @@ # set by jni: tableOptions.setBlockCache block_cache=206150041 # set by jni: tableOptions.setFormatVersion - format_version=2 + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash # set by jni: tableOptions.setFilterPolicy, bloomfilter:[bits_per_key]:[use_block_based_builder] diff --git a/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf b/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf index 0f3a08779e..2dbecf36c3 100644 --- a/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf @@ -26,4 +26,6 @@ [CFOptions "default"] # set by jni: options.setLogFileTimeToRoll - log_file_time_to_roll=86400 \ No newline at end of file + log_file_time_to_roll=86400 + # set by jni: tableOptions.setFormatVersion + format_version=5 \ No newline at end of file diff --git a/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf b/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf index 9d1c3e08c4..1defdf4fc1 100644 --- a/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf +++ b/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf @@ -40,7 +40,7 @@ # set by jni: tableOptions.setBlockCache block_cache=206150041 # set by jni: tableOptions.setFormatVersion - format_version=2 + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash # set by jni: tableOptions.setFilterPolicy, bloomfilter:[bits_per_key]:[use_block_based_builder] diff --git a/conf/bk_server.conf b/conf/bk_server.conf index e45fd2a9b7..dca7efdad2 100755 --- a/conf/bk_server.conf +++ b/conf/bk_server.conf @@ -782,7 +782,7 @@ gcEntryLogMetadataCacheEnabled=false # dbStorage_rocksDB_numFilesInLevel0=4 # dbStorage_rocksDB_maxSizeInLevel1MB=256 # dbStorage_rocksDB_logPath= -# dbStorage_rocksDB_format_version=2 +# dbStorage_rocksDB_format_version=5 ############################################################################# ## DirectIO entry logger configuration diff --git a/conf/default_rocksdb.conf.default b/conf/default_rocksdb.conf.default index e9b8e7c3ec..80d504ba43 100644 --- a/conf/default_rocksdb.conf.default +++ b/conf/default_rocksdb.conf.default @@ -29,5 +29,7 @@ log_file_time_to_roll=86400 [TableOptions/BlockBasedTable "default"] + # set by jni: tableOptions.setFormatVersion + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash \ No newline at end of file diff --git a/conf/entry_location_rocksdb.conf.default b/conf/entry_location_rocksdb.conf.default index 6f6c1b4d05..0ccc7cb37a 100644 --- a/conf/entry_location_rocksdb.conf.default +++ b/conf/entry_location_rocksdb.conf.default @@ -60,7 +60,7 @@ # set by jni: tableOptions.setBlockCache block_cache=206150041 # set by jni: tableOptions.setFormatVersion - format_version=2 + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash # set by jni: tableOptions.setFilterPolicy, bloomfilter:[bits_per_key]:[use_block_based_builder] diff --git a/conf/ledger_metadata_rocksdb.conf.default b/conf/ledger_metadata_rocksdb.conf.default index e9b8e7c3ec..80d504ba43 100644 --- a/conf/ledger_metadata_rocksdb.conf.default +++ b/conf/ledger_metadata_rocksdb.conf.default @@ -29,5 +29,7 @@ log_file_time_to_roll=86400 [TableOptions/BlockBasedTable "default"] + # set by jni: tableOptions.setFormatVersion + format_version=5 # set by jni: tableOptions.setChecksumType checksum=kxxHash \ No newline at end of file
