]>
Commit | Line | Data |
---|---|---|
1b11728e JB |
1 | --- ceph-12.2.13/src/kv/RocksDBStore.cc.orig 2020-01-30 21:52:36.000000000 +0100 |
2 | +++ ceph-12.2.13/src/kv/RocksDBStore.cc 2020-05-28 18:54:37.329337101 +0200 | |
3 | @@ -522,7 +522,7 @@ | |
4 | // considering performance overhead, default is disabled | |
5 | if (g_conf->rocksdb_perf) { | |
6 | rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); | |
7 | - rocksdb::perf_context.Reset(); | |
8 | + rocksdb::get_perf_context()->Reset(); | |
9 | } | |
10 | ||
11 | RocksDBTransactionImpl * _t = | |
12 | @@ -549,13 +549,13 @@ | |
13 | utime_t write_wal_time; | |
14 | utime_t write_pre_and_post_process_time; | |
15 | write_wal_time.set_from_double( | |
16 | - static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000); | |
17 | + static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000); | |
18 | write_memtable_time.set_from_double( | |
19 | - static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000); | |
20 | + static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000); | |
21 | write_delay_time.set_from_double( | |
22 | - static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000); | |
23 | + static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000); | |
24 | write_pre_and_post_process_time.set_from_double( | |
25 | - static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); | |
26 | + static_cast<double>(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); | |
27 | logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); | |
28 | logger->tinc(l_rocksdb_write_delay_time, write_delay_time); | |
29 | logger->tinc(l_rocksdb_write_wal_time, write_wal_time); | |
30 | @@ -575,7 +575,7 @@ | |
31 | // considering performance overhead, default is disabled | |
32 | if (g_conf->rocksdb_perf) { | |
33 | rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); | |
34 | - rocksdb::perf_context.Reset(); | |
35 | + rocksdb::get_perf_context()->Reset(); | |
36 | } | |
37 | ||
38 | RocksDBTransactionImpl * _t = | |
39 | @@ -603,13 +603,13 @@ | |
40 | utime_t write_wal_time; | |
41 | utime_t write_pre_and_post_process_time; | |
42 | write_wal_time.set_from_double( | |
43 | - static_cast<double>(rocksdb::perf_context.write_wal_time)/1000000000); | |
44 | + static_cast<double>(rocksdb::get_perf_context()->write_wal_time)/1000000000); | |
45 | write_memtable_time.set_from_double( | |
46 | - static_cast<double>(rocksdb::perf_context.write_memtable_time)/1000000000); | |
47 | + static_cast<double>(rocksdb::get_perf_context()->write_memtable_time)/1000000000); | |
48 | write_delay_time.set_from_double( | |
49 | - static_cast<double>(rocksdb::perf_context.write_delay_time)/1000000000); | |
50 | + static_cast<double>(rocksdb::get_perf_context()->write_delay_time)/1000000000); | |
51 | write_pre_and_post_process_time.set_from_double( | |
52 | - static_cast<double>(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); | |
53 | + static_cast<double>(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); | |
54 | logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); | |
55 | logger->tinc(l_rocksdb_write_delay_time, write_delay_time); | |
56 | logger->tinc(l_rocksdb_write_wal_time, write_wal_time); |