Fix compatibility with newer versions of RocksDB. Adapted from this upstream patch, with some additional changes for 12.2: https://github.com/ceph/ceph/commit/9d73a7121fdb1ae87cb1aa6f7d9d7a13f329ae68 diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc index 8660afe1886d..bc0de79e23cb 100644 --- a/src/kv/RocksDBStore.cc +++ b/src/kv/RocksDBStore.cc @@ -505,7 +505,7 @@ // considering performance overhead, default is disabled if (g_conf->rocksdb_perf) { rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); - rocksdb::perf_context.Reset(); + rocksdb::get_perf_context()->Reset(); } RocksDBTransactionImpl * _t = @@ -532,13 +532,13 @@ utime_t write_wal_time; utime_t write_pre_and_post_process_time; write_wal_time.set_from_double( - static_cast(rocksdb::perf_context.write_wal_time)/1000000000); + static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000); write_memtable_time.set_from_double( - static_cast(rocksdb::perf_context.write_memtable_time)/1000000000); + static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000); write_delay_time.set_from_double( - static_cast(rocksdb::perf_context.write_delay_time)/1000000000); + static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000); write_pre_and_post_process_time.set_from_double( - static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); + static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); logger->tinc(l_rocksdb_write_delay_time, write_delay_time); logger->tinc(l_rocksdb_write_wal_time, write_wal_time); @@ -558,7 +558,7 @@ // considering performance overhead, default is disabled if (g_conf->rocksdb_perf) { rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); - rocksdb::perf_context.Reset(); + rocksdb::get_perf_context()->Reset(); } RocksDBTransactionImpl * _t = @@ -586,13 +586,13 @@ utime_t write_wal_time; utime_t write_pre_and_post_process_time; write_wal_time.set_from_double( - static_cast(rocksdb::perf_context.write_wal_time)/1000000000); + static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000); write_memtable_time.set_from_double( - static_cast(rocksdb::perf_context.write_memtable_time)/1000000000); + static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000); write_delay_time.set_from_double( - static_cast(rocksdb::perf_context.write_delay_time)/1000000000); + static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000); write_pre_and_post_process_time.set_from_double( - static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); + static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); logger->tinc(l_rocksdb_write_delay_time, write_delay_time); logger->tinc(l_rocksdb_write_wal_time, write_wal_time); 4-01-01 00:45:47 +0100'>2024-01-01nls: Update translations....Florian Pelz 2023-10-31nls: Update translations....Florian Pelz 2023-10-05doc: Fix channel name typo....Nikolaos Chatzikonstantinou 2023-09-30nls: Update translations.Florian Pelz 2023-08-31nls: Update translations.Florian Pelz 2023-07-31nls: Update translations.Florian Pelz