pyrox.dev
1Seulement dans ceph: ceph.old
2diff -ur ceph.old/src/kv/RocksDBStore.cc ceph/src/kv/RocksDBStore.cc
3--- ceph.old/src/kv/RocksDBStore.cc 1980-01-02 00:00:00.000000000 +0100
4+++ ceph/src/kv/RocksDBStore.cc 2018-01-24 14:08:35.017553372 +0100
5@@ -505,7 +505,7 @@
6 // considering performance overhead, default is disabled
7 if (g_conf->rocksdb_perf) {
8 rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
9- rocksdb::perf_context.Reset();
10+ rocksdb::get_perf_context()->Reset();
11 }
12
13 RocksDBTransactionImpl * _t =
14@@ -532,13 +532,13 @@
15 utime_t write_wal_time;
16 utime_t write_pre_and_post_process_time;
17 write_wal_time.set_from_double(
18- static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000);
19+ static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000);
20 write_memtable_time.set_from_double(
21- static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000);
22+ static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
23 write_delay_time.set_from_double(
24- static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000);
25+ static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000);
26 write_pre_and_post_process_time.set_from_double(
27- static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
28+ static_cast<double>(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000);
29 logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time);
30 logger->tinc(l_rocksdb_write_delay_time, write_delay_time);
31 logger->tinc(l_rocksdb_write_wal_time, write_wal_time);
32@@ -558,7 +558,7 @@
33 // considering performance overhead, default is disabled
34 if (g_conf->rocksdb_perf) {
35 rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
36- rocksdb::perf_context.Reset();
37+ rocksdb::get_perf_context()->Reset();
38 }
39
40 RocksDBTransactionImpl * _t =
41@@ -586,13 +586,13 @@
42 utime_t write_wal_time;
43 utime_t write_pre_and_post_process_time;
44 write_wal_time.set_from_double(
45- static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000);
46+ static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000);
47 write_memtable_time.set_from_double(
48- static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000);
49+ static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
50 write_delay_time.set_from_double(
51- static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000);
52+ static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000);
53 write_pre_and_post_process_time.set_from_double(
54- static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
55+ static_cast<double>(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000);
56 logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time);
57 logger->tinc(l_rocksdb_write_delay_time, write_delay_time);
58 logger->tinc(l_rocksdb_write_wal_time, write_wal_time);