diff --git a/db/builder.cc b/db/builder.cc index 99ddcb049..388c94126 100644 --- a/db/builder.cc +++ b/db/builder.cc @@ -103,9 +103,8 @@ Status BuildTable( // TODO(noetzli): Update stats after flush, too. if (io_priority == Env::IO_HIGH && IOSTATS(bytes_written) >= kReportFlushIOStatsEvery) { - ThreadStatusUtil::IncreaseThreadOperationProperty( + ThreadStatusUtil::SetThreadOperationProperty( ThreadStatus::FLUSH_BYTES_WRITTEN, IOSTATS(bytes_written)); - IOSTATS_RESET(bytes_written); } } diff --git a/db/db_test.cc b/db/db_test.cc index 68cdb874d..82915e372 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -8121,6 +8121,9 @@ TEST_F(DBTest, MergeTestTime) { ASSERT_LT(TestGetTickerCount(options, MERGE_OPERATION_TOTAL_TIME), 6000000); ASSERT_GT(TestGetTickerCount(options, MERGE_OPERATION_TOTAL_TIME), 3200000); +#if ROCKSDB_USING_THREAD_STATUS + ASSERT_GT(TestGetTickerCount(options, FLUSH_WRITE_BYTES), 0); +#endif // ROCKSDB_USING_THREAD_STATUS } TEST_P(DBTestWithParam, MergeCompactionTimeTest) { diff --git a/db/flush_job.cc b/db/flush_job.cc index e42e3c0e4..410108a05 100644 --- a/db/flush_job.cc +++ b/db/flush_job.cc @@ -111,9 +111,8 @@ void FlushJob::ReportFlushInputSize(const autovector& mems) { } void FlushJob::RecordFlushIOStats() { - ThreadStatusUtil::IncreaseThreadOperationProperty( + ThreadStatusUtil::SetThreadOperationProperty( ThreadStatus::FLUSH_BYTES_WRITTEN, IOSTATS(bytes_written)); - IOSTATS_RESET(bytes_written); } Status FlushJob::Run(FileMetaData* file_meta) {