mirror of
https://github.com/facebook/rocksdb.git
synced 2024-12-04 02:02:41 +00:00
44fd914128
Summary: Fixes https://github.com/facebook/rocksdb/issues/12061. We were double counting the `BYTES_WRITTEN` ticker when doing writes with transactions. During transactions, after writing, a client can call `Prepare()`, which writes the values to WAL but not to the Memtable. After that, they can call `Commit()`, which writes a commit marker to the WAL and the values to Memtable. The cause of this bug is previously during writes, we didn't take into account `writer->ShouldWriteToMemtable()` before adding to `total_byte_size`, so it is still added to during the `Prepare()` phase even though we're not writing to the Memtable, which was why we saw the value to be double of what's written to WAL. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12111 Test Plan: Added a test in `db/db_statistics_test.cc` that tests writes with and without transactions, by comparing the values of `BYTES_WRITTEN` and `WAL_FILE_BYTES` after doing writes. Reviewed By: jaykorean Differential Revision: D51954327 Pulled By: jowlyzhang fbshipit-source-id: 57a0986a14e5b94eb5188715d819212529110d2c
98 lines
3.9 KiB
C++
98 lines
3.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).
|
|
//
|
|
#pragma once
|
|
#include "monitoring/perf_step_timer.h"
|
|
#include "rocksdb/perf_context.h"
|
|
#include "util/stop_watch.h"
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
#if defined(NPERF_CONTEXT)
|
|
extern PerfContext perf_context;
|
|
#else
|
|
#if defined(OS_SOLARIS)
|
|
extern thread_local PerfContext perf_context_;
|
|
#define perf_context (*get_perf_context())
|
|
#else
|
|
extern thread_local PerfContext perf_context;
|
|
#endif
|
|
#endif
|
|
|
|
#if defined(NPERF_CONTEXT)
|
|
|
|
#define PERF_TIMER_STOP(metric)
|
|
#define PERF_TIMER_START(metric)
|
|
#define PERF_TIMER_GUARD(metric)
|
|
#define PERF_TIMER_GUARD_WITH_CLOCK(metric, clock)
|
|
#define PERF_CPU_TIMER_GUARD(metric, clock)
|
|
#define PERF_CONDITIONAL_TIMER_FOR_MUTEX_GUARD(metric, condition, stats, \
|
|
ticker_type)
|
|
#define PERF_TIMER_MEASURE(metric)
|
|
#define PERF_COUNTER_ADD(metric, value)
|
|
#define PERF_COUNTER_BY_LEVEL_ADD(metric, value, level)
|
|
|
|
#else
|
|
|
|
// Stop the timer and update the metric
|
|
#define PERF_TIMER_STOP(metric) perf_step_timer_##metric.Stop();
|
|
|
|
#define PERF_TIMER_START(metric) perf_step_timer_##metric.Start();
|
|
|
|
// Declare and set start time of the timer
|
|
#define PERF_TIMER_GUARD(metric) \
|
|
PerfStepTimer perf_step_timer_##metric(&(perf_context.metric)); \
|
|
perf_step_timer_##metric.Start();
|
|
|
|
// Declare and set start time of the timer
|
|
#define PERF_TIMER_GUARD_WITH_CLOCK(metric, clock) \
|
|
PerfStepTimer perf_step_timer_##metric(&(perf_context.metric), clock); \
|
|
perf_step_timer_##metric.Start();
|
|
|
|
// Declare and set start time of the timer
|
|
#define PERF_CPU_TIMER_GUARD(metric, clock) \
|
|
PerfStepTimer perf_step_timer_##metric( \
|
|
&(perf_context.metric), clock, true, \
|
|
PerfLevel::kEnableTimeAndCPUTimeExceptForMutex); \
|
|
perf_step_timer_##metric.Start();
|
|
|
|
#define PERF_CONDITIONAL_TIMER_FOR_MUTEX_GUARD(metric, condition, stats, \
|
|
ticker_type) \
|
|
PerfStepTimer perf_step_timer_##metric(&(perf_context.metric), nullptr, \
|
|
false, PerfLevel::kEnableTime, stats, \
|
|
ticker_type); \
|
|
if (condition) { \
|
|
perf_step_timer_##metric.Start(); \
|
|
}
|
|
|
|
// Update metric with time elapsed since last START. start time is reset
|
|
// to current timestamp.
|
|
#define PERF_TIMER_MEASURE(metric) perf_step_timer_##metric.Measure();
|
|
|
|
// Increase metric value
|
|
#define PERF_COUNTER_ADD(metric, value) \
|
|
if (perf_level >= PerfLevel::kEnableCount) { \
|
|
perf_context.metric += value; \
|
|
} \
|
|
static_assert(true, "semicolon required")
|
|
|
|
// Increase metric value
|
|
#define PERF_COUNTER_BY_LEVEL_ADD(metric, value, level) \
|
|
if (perf_level >= PerfLevel::kEnableCount && \
|
|
perf_context.per_level_perf_context_enabled && \
|
|
perf_context.level_to_perf_context) { \
|
|
if ((*(perf_context.level_to_perf_context)).find(level) != \
|
|
(*(perf_context.level_to_perf_context)).end()) { \
|
|
(*(perf_context.level_to_perf_context))[level].metric += value; \
|
|
} else { \
|
|
PerfContextByLevel empty_context; \
|
|
(*(perf_context.level_to_perf_context))[level] = empty_context; \
|
|
(*(perf_context.level_to_perf_context))[level].metric += value; \
|
|
} \
|
|
}
|
|
|
|
#endif
|
|
|
|
} // namespace ROCKSDB_NAMESPACE
|