gnu/packages/patches/ceph-rocksdb-compat.patch

   1 Fix compatibility with newer versions of RocksDB.
   2
   3 Adapted from this upstream patch, with some additional changes for 12.2:
   4 https://github.com/ceph/ceph/commit/9d73a7121fdb1ae87cb1aa6f7d9d7a13f329ae68
   5
   6 diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
   7 index 8660afe1886d..bc0de79e23cb 100644
   8 --- a/src/kv/RocksDBStore.cc
   9 +++ b/src/kv/RocksDBStore.cc
  10 @@ -505,7 +505,7 @@
  11    // considering performance overhead, default is disabled
  12    if (g_conf->rocksdb_perf) {
  13      rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
  14 -    rocksdb::perf_context.Reset();
  15 +    rocksdb::get_perf_context()->Reset();
  16    }
  17
  18    RocksDBTransactionImpl * _t =
  19 @@ -532,13 +532,13 @@
  20      utime_t write_wal_time;
  21      utime_t write_pre_and_post_process_time;
  22      write_wal_time.set_from_double(
  23 -       static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000);
  24 +       static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000);
  25      write_memtable_time.set_from_double(
  26 -       static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000);
  27 +       static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
  28      write_delay_time.set_from_double(
  29 -       static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000);
  30 +       static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000);
  31      write_pre_and_post_process_time.set_from_double(
  32 -       static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
  33 +       static_cast<double>(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000);
  34      logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time);
  35      logger->tinc(l_rocksdb_write_delay_time, write_delay_time);
  36      logger->tinc(l_rocksdb_write_wal_time, write_wal_time);
  37 @@ -558,7 +558,7 @@
  38    // considering performance overhead, default is disabled
  39    if (g_conf->rocksdb_perf) {
  40      rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
  41 -    rocksdb::perf_context.Reset();
  42 +    rocksdb::get_perf_context()->Reset();
  43    }
  44
  45    RocksDBTransactionImpl * _t =
  46 @@ -586,13 +586,13 @@
  47      utime_t write_wal_time;
  48      utime_t write_pre_and_post_process_time;
  49      write_wal_time.set_from_double(
  50 -       static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000);
  51 +       static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000);
  52      write_memtable_time.set_from_double(
  53 -       static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000);
  54 +       static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
  55      write_delay_time.set_from_double(
  56 -       static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000);
  57 +       static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000);
  58      write_pre_and_post_process_time.set_from_double(
  59 -       static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
  60 +       static_cast<double>(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000);
  61      logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time);
  62      logger->tinc(l_rocksdb_write_delay_time, write_delay_time);
  63      logger->tinc(l_rocksdb_write_wal_time, write_wal_time);