mirror of
https://github.com/facebook/rocksdb.git
synced 2024-11-26 16:30:56 +00:00
151242ce46
Summary: **Context:** The existing stat rocksdb.sst.read.micros does not reflect each of compaction and flush cases but aggregate them, which is not so helpful for us to understand IO read behavior of each of them. **Summary** - Update `StopWatch` and `RandomAccessFileReader` to record `rocksdb.sst.read.micros` and `rocksdb.file.{flush/compaction}.read.micros` - Fixed the default histogram in `RandomAccessFileReader` - New field `ReadOptions/IOOptions::io_activity`; Pass `ReadOptions` through paths under db open, flush and compaction to where we can prepare `IOOptions` and pass it to `RandomAccessFileReader` - Use `thread_status_util` for assertion in `DbStressFSWrapper` for continuous testing on we are passing correct `io_activity` under db open, flush and compaction Pull Request resolved: https://github.com/facebook/rocksdb/pull/11288 Test Plan: - **Stress test** - **Db bench 1: rocksdb.sst.read.micros COUNT ≈ sum of rocksdb.file.read.flush.micros's and rocksdb.file.read.compaction.micros's.** (without blob) - May not be exactly the same due to `HistogramStat::Add` only guarantees atomic not accuracy across threads. ``` ./db_bench -db=/dev/shm/testdb/ -statistics=true -benchmarks="fillseq" -key_size=32 -value_size=512 -num=50000 -write_buffer_size=655 -target_file_size_base=655 -disable_auto_compactions=false -compression_type=none -bloom_bits=3 (-use_plain_table=1 -prefix_size=10) ``` ``` // BlockBasedTable rocksdb.sst.read.micros P50 : 2.009374 P95 : 4.968548 P99 : 8.110362 P100 : 43.000000 COUNT : 40456 SUM : 114805 rocksdb.file.read.flush.micros P50 : 1.871841 P95 : 3.872407 P99 : 5.540541 P100 : 43.000000 COUNT : 2250 SUM : 6116 rocksdb.file.read.compaction.micros P50 : 2.023109 P95 : 5.029149 P99 : 8.196910 P100 : 26.000000 COUNT : 38206 SUM : 108689 // PlainTable Does not apply ``` - **Db bench 2: performance** **Read** SETUP: db with 900 files ``` ./db_bench -db=/dev/shm/testdb/ -benchmarks="fillseq" -key_size=32 -value_size=512 -num=50000 -write_buffer_size=655 -disable_auto_compactions=true -target_file_size_base=655 -compression_type=none ```run till convergence ``` ./db_bench -seed=1678564177044286 -use_existing_db=true -db=/dev/shm/testdb -benchmarks=readrandom[-X60] -statistics=true -num=1000000 -disable_auto_compactions=true -compression_type=none -bloom_bits=3 ``` Pre-change `readrandom [AVG 60 runs] : 21568 (± 248) ops/sec` Post-change (no regression, -0.3%) `readrandom [AVG 60 runs] : 21486 (± 236) ops/sec` **Compaction/Flush**run till convergence ``` ./db_bench -db=/dev/shm/testdb2/ -seed=1678564177044286 -benchmarks="fillseq[-X60]" -key_size=32 -value_size=512 -num=50000 -write_buffer_size=655 -disable_auto_compactions=false -target_file_size_base=655 -compression_type=none rocksdb.sst.read.micros COUNT : 33820 rocksdb.sst.read.flush.micros COUNT : 1800 rocksdb.sst.read.compaction.micros COUNT : 32020 ``` Pre-change `fillseq [AVG 46 runs] : 1391 (± 214) ops/sec; 0.7 (± 0.1) MB/sec` Post-change (no regression, ~-0.4%) `fillseq [AVG 46 runs] : 1385 (± 216) ops/sec; 0.7 (± 0.1) MB/sec` Reviewed By: ajkr Differential Revision: D44007011 Pulled By: hx235 fbshipit-source-id: a54c89e4846dfc9a135389edf3f3eedfea257132
209 lines
6.9 KiB
C++
209 lines
6.9 KiB
C++
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
|
// This source code is licensed under both the GPLv2 (found in the
|
|
// COPYING file in the root directory) and Apache 2.0 License
|
|
// (found in the LICENSE.Apache file in the root directory).
|
|
|
|
#include "monitoring/thread_status_util.h"
|
|
|
|
#include "monitoring/thread_status_updater.h"
|
|
#include "rocksdb/env.h"
|
|
#include "rocksdb/system_clock.h"
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
|
|
#ifdef ROCKSDB_USING_THREAD_STATUS
|
|
thread_local ThreadStatusUpdater*
|
|
ThreadStatusUtil::thread_updater_local_cache_ = nullptr;
|
|
thread_local bool ThreadStatusUtil::thread_updater_initialized_ = false;
|
|
|
|
void ThreadStatusUtil::RegisterThread(const Env* env,
|
|
ThreadStatus::ThreadType thread_type) {
|
|
if (!MaybeInitThreadLocalUpdater(env)) {
|
|
return;
|
|
}
|
|
assert(thread_updater_local_cache_);
|
|
thread_updater_local_cache_->RegisterThread(thread_type, env->GetThreadID());
|
|
}
|
|
|
|
void ThreadStatusUtil::UnregisterThread() {
|
|
thread_updater_initialized_ = false;
|
|
if (thread_updater_local_cache_ != nullptr) {
|
|
thread_updater_local_cache_->UnregisterThread();
|
|
thread_updater_local_cache_ = nullptr;
|
|
}
|
|
}
|
|
|
|
void ThreadStatusUtil::SetEnableTracking(bool enable_tracking) {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
return;
|
|
}
|
|
thread_updater_local_cache_->SetEnableTracking(enable_tracking);
|
|
}
|
|
|
|
void ThreadStatusUtil::SetColumnFamily(const ColumnFamilyData* cfd) {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
return;
|
|
}
|
|
assert(cfd);
|
|
thread_updater_local_cache_->SetColumnFamilyInfoKey(cfd);
|
|
}
|
|
|
|
void ThreadStatusUtil::SetThreadOperation(ThreadStatus::OperationType op) {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
return;
|
|
}
|
|
|
|
if (op != ThreadStatus::OP_UNKNOWN) {
|
|
uint64_t current_time = SystemClock::Default()->NowMicros();
|
|
thread_updater_local_cache_->SetOperationStartTime(current_time);
|
|
} else {
|
|
// TDOO(yhchiang): we could report the time when we set operation to
|
|
// OP_UNKNOWN once the whole instrumentation has been done.
|
|
thread_updater_local_cache_->SetOperationStartTime(0);
|
|
}
|
|
thread_updater_local_cache_->SetThreadOperation(op);
|
|
}
|
|
|
|
ThreadStatus::OperationType ThreadStatusUtil::GetThreadOperation() {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
return ThreadStatus::OperationType::OP_UNKNOWN;
|
|
}
|
|
return thread_updater_local_cache_->GetThreadOperation();
|
|
}
|
|
|
|
ThreadStatus::OperationStage ThreadStatusUtil::SetThreadOperationStage(
|
|
ThreadStatus::OperationStage stage) {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
// thread_updater_local_cache_ must be set in SetColumnFamily
|
|
// or other ThreadStatusUtil functions.
|
|
return ThreadStatus::STAGE_UNKNOWN;
|
|
}
|
|
|
|
return thread_updater_local_cache_->SetThreadOperationStage(stage);
|
|
}
|
|
|
|
void ThreadStatusUtil::SetThreadOperationProperty(int code, uint64_t value) {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
// thread_updater_local_cache_ must be set in SetColumnFamily
|
|
// or other ThreadStatusUtil functions.
|
|
return;
|
|
}
|
|
|
|
thread_updater_local_cache_->SetThreadOperationProperty(code, value);
|
|
}
|
|
|
|
void ThreadStatusUtil::IncreaseThreadOperationProperty(int code,
|
|
uint64_t delta) {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
// thread_updater_local_cache_ must be set in SetColumnFamily
|
|
// or other ThreadStatusUtil functions.
|
|
return;
|
|
}
|
|
|
|
thread_updater_local_cache_->IncreaseThreadOperationProperty(code, delta);
|
|
}
|
|
|
|
void ThreadStatusUtil::SetThreadState(ThreadStatus::StateType state) {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
// thread_updater_local_cache_ must be set in SetColumnFamily
|
|
// or other ThreadStatusUtil functions.
|
|
return;
|
|
}
|
|
|
|
thread_updater_local_cache_->SetThreadState(state);
|
|
}
|
|
|
|
void ThreadStatusUtil::ResetThreadStatus() {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
return;
|
|
}
|
|
thread_updater_local_cache_->ResetThreadStatus();
|
|
}
|
|
|
|
void ThreadStatusUtil::NewColumnFamilyInfo(const DB* db,
|
|
const ColumnFamilyData* cfd,
|
|
const std::string& cf_name,
|
|
const Env* env) {
|
|
if (!MaybeInitThreadLocalUpdater(env)) {
|
|
return;
|
|
}
|
|
assert(thread_updater_local_cache_);
|
|
if (thread_updater_local_cache_) {
|
|
thread_updater_local_cache_->NewColumnFamilyInfo(db, db->GetName(), cfd,
|
|
cf_name);
|
|
}
|
|
}
|
|
|
|
void ThreadStatusUtil::EraseColumnFamilyInfo(const ColumnFamilyData* cfd) {
|
|
if (thread_updater_local_cache_ == nullptr) {
|
|
return;
|
|
}
|
|
thread_updater_local_cache_->EraseColumnFamilyInfo(cfd);
|
|
}
|
|
|
|
void ThreadStatusUtil::EraseDatabaseInfo(const DB* db) {
|
|
ThreadStatusUpdater* thread_updater = db->GetEnv()->GetThreadStatusUpdater();
|
|
if (thread_updater == nullptr) {
|
|
return;
|
|
}
|
|
thread_updater->EraseDatabaseInfo(db);
|
|
}
|
|
|
|
bool ThreadStatusUtil::MaybeInitThreadLocalUpdater(const Env* env) {
|
|
if (!thread_updater_initialized_ && env != nullptr) {
|
|
thread_updater_initialized_ = true;
|
|
thread_updater_local_cache_ = env->GetThreadStatusUpdater();
|
|
}
|
|
return (thread_updater_local_cache_ != nullptr);
|
|
}
|
|
|
|
AutoThreadOperationStageUpdater::AutoThreadOperationStageUpdater(
|
|
ThreadStatus::OperationStage stage) {
|
|
prev_stage_ = ThreadStatusUtil::SetThreadOperationStage(stage);
|
|
}
|
|
|
|
AutoThreadOperationStageUpdater::~AutoThreadOperationStageUpdater() {
|
|
ThreadStatusUtil::SetThreadOperationStage(prev_stage_);
|
|
}
|
|
|
|
#else
|
|
|
|
ThreadStatusUpdater* ThreadStatusUtil::thread_updater_local_cache_ = nullptr;
|
|
bool ThreadStatusUtil::thread_updater_initialized_ = false;
|
|
|
|
bool ThreadStatusUtil::MaybeInitThreadLocalUpdater(const Env* /*env*/) {
|
|
return false;
|
|
}
|
|
|
|
void ThreadStatusUtil::SetColumnFamily(const ColumnFamilyData* /*cfd*/) {}
|
|
|
|
void ThreadStatusUtil::SetThreadOperation(ThreadStatus::OperationType /*op*/) {}
|
|
|
|
void ThreadStatusUtil::SetThreadOperationProperty(int /*code*/,
|
|
uint64_t /*value*/) {}
|
|
|
|
void ThreadStatusUtil::IncreaseThreadOperationProperty(int /*code*/,
|
|
uint64_t /*delta*/) {}
|
|
|
|
void ThreadStatusUtil::SetThreadState(ThreadStatus::StateType /*state*/) {}
|
|
|
|
void ThreadStatusUtil::NewColumnFamilyInfo(const DB* /*db*/,
|
|
const ColumnFamilyData* /*cfd*/,
|
|
const std::string& /*cf_name*/,
|
|
const Env* env) {}
|
|
|
|
void ThreadStatusUtil::EraseColumnFamilyInfo(const ColumnFamilyData* /*cfd*/) {}
|
|
|
|
void ThreadStatusUtil::EraseDatabaseInfo(const DB* /*db*/) {}
|
|
|
|
void ThreadStatusUtil::ResetThreadStatus() {}
|
|
|
|
AutoThreadOperationStageUpdater::AutoThreadOperationStageUpdater(
|
|
ThreadStatus::OperationStage /*stage*/) {}
|
|
|
|
AutoThreadOperationStageUpdater::~AutoThreadOperationStageUpdater() {}
|
|
|
|
#endif // ROCKSDB_USING_THREAD_STATUS
|
|
|
|
} // namespace ROCKSDB_NAMESPACE
|