(bookkeeper) 03/06: Backport: Set default format_version to 2 for RocksDB databases (#4480)

[lhotari]

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git

commit 4a7e91e8dc75ebea450f2efdd9046233092bef55
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Fri Aug 16 13:43:31 2024 +0300

    Backport: Set default format_version to 2 for RocksDB databases (#4480)
    
    - backported from #4480
    
    (cherry picked from commit 8c7dea6503a635707e36f4392ddfc44d2ccb9b54)
---
 bookkeeper-server/src/test/resources/conf/default_rocksdb.conf        | 2 ++
 .../src/test/resources/conf/ledger_metadata_rocksdb.conf              | 4 +++-
 conf/default_rocksdb.conf.default                                     | 2 ++
 conf/ledger_metadata_rocksdb.conf.default                             | 4 +++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf 
b/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf
index df433a33e9..793911e9fe 100644
--- a/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf
+++ b/bookkeeper-server/src/test/resources/conf/default_rocksdb.conf
@@ -30,5 +30,7 @@
  #no default setting in CFOptions
 
 [TableOptions/BlockBasedTable "default"]
+ # set by jni: tableOptions.setFormatVersion
+ format_version=2
  # set by jni: tableOptions.setChecksumType
  checksum=kxxHash
\ No newline at end of file
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 f84c0167ed..793911e9fe 100644
--- a/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf
+++ b/bookkeeper-server/src/test/resources/conf/ledger_metadata_rocksdb.conf
@@ -25,10 +25,12 @@
  keep_log_file_num=30
  # set by jni: options.setLogFileTimeToRoll
  log_file_time_to_roll=86400
- 
+
  [CFOptions "default"]
  #no default setting in CFOptions
 
 [TableOptions/BlockBasedTable "default"]
+ # set by jni: tableOptions.setFormatVersion
+ format_version=2
  # set by jni: tableOptions.setChecksumType
  checksum=kxxHash
\ No newline at end of file
diff --git a/conf/default_rocksdb.conf.default 
b/conf/default_rocksdb.conf.default
index d8a77dd9d3..806e7576e0 100644
--- a/conf/default_rocksdb.conf.default
+++ b/conf/default_rocksdb.conf.default
@@ -34,5 +34,7 @@
  #no default setting in CFOptions
 
 [TableOptions/BlockBasedTable "default"]
+ # set by jni: tableOptions.setFormatVersion
+ format_version=2
  # set by jni: tableOptions.setChecksumType
  checksum=kxxHash
\ No newline at end of file
diff --git a/conf/ledger_metadata_rocksdb.conf.default 
b/conf/ledger_metadata_rocksdb.conf.default
index 0bf7934922..806e7576e0 100644
--- a/conf/ledger_metadata_rocksdb.conf.default
+++ b/conf/ledger_metadata_rocksdb.conf.default
@@ -29,10 +29,12 @@
  keep_log_file_num=30
  # set by jni: options.setLogFileTimeToRoll
  log_file_time_to_roll=86400
- 
+
  [CFOptions "default"]
  #no default setting in CFOptions
 
 [TableOptions/BlockBasedTable "default"]
+ # set by jni: tableOptions.setFormatVersion
+ format_version=2
  # set by jni: tableOptions.setChecksumType
  checksum=kxxHash
\ No newline at end of file