]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
kv/RocksDBStore: update to accomodate the change in rocksdb 5.6.0
authorKefu Chai <kchai@redhat.com>
Thu, 31 Aug 2017 05:02:08 +0000 (13:02 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 15 Sep 2017 09:16:28 +0000 (17:16 +0800)
per rocksdb's HISTORY.md, it

> replace global variable `PerfContext perf_context` with `PerfContext*
> get_perf_context()`.

hence the change.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/kv/RocksDBStore.cc

index 8660afe1886d50b5538b3b140b1024b825d25a7c..bc0de79e23cbb5a4a53b7994b918ea46dd030c14 100644 (file)
@@ -504,7 +504,7 @@ int RocksDBStore::submit_common(rocksdb::WriteOptions& woptions, KeyValueDB::Tra
   // 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 =
@@ -529,13 +529,13 @@ int RocksDBStore::submit_common(rocksdb::WriteOptions& woptions, KeyValueDB::Tra
     utime_t write_wal_time;
     utime_t write_pre_and_post_process_time;
     write_wal_time.set_from_double(
-       static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000);
+       static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000);
     write_memtable_time.set_from_double(
-       static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000);
+       static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
     write_delay_time.set_from_double(
-       static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000);
+       static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000);
     write_pre_and_post_process_time.set_from_double(
-       static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
+       static_cast<double>(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);