mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 22:50:49 +00:00
6beb4da2f6
- Update Ceph to last version - Solve vulernatibility problem in the old version - Patch rocksdb ceph rocksdb API - Simplify a lot ceph build by switching to CMake This Pull request require #34662 and #34661 to be effective
59 lines
3 KiB
Diff
59 lines
3 KiB
Diff
Seulement dans ceph: ceph.old
|
|
diff -ur ceph.old/src/kv/RocksDBStore.cc ceph/src/kv/RocksDBStore.cc
|
|
--- ceph.old/src/kv/RocksDBStore.cc 1980-01-02 00:00:00.000000000 +0100
|
|
+++ ceph/src/kv/RocksDBStore.cc 2018-01-24 14:08:35.017553372 +0100
|
|
@@ -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<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);
|
|
@@ -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<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);
|