andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for TSAN failure in DeleteScheduler (#7029)

Browse Source 
Summary:
TSAN failure caused by setting statistics in SstFileManager and DeleteScheduler.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7029

Test Plan:
1. make check -j64
           2. COMPILE_WITH_TSAN=1 make check -j64

Reviewed By: siying, zhichao-cao

Differential Revision: D22223418

Pulled By: akankshamahajan15

fbshipit-source-id: c5bf336d711b787908dfeb6166cab4aa2e494d61
This commit is contained in:
Akanksha Mahajan 2020-06-26 15:33:51 -07:00 committed by Facebook GitHub Bot
parent 1569dc48f5
commit b9d51b8684
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
file/delete_scheduler.cc
View File

@ -71,6 +71,7 @@ Status DeleteScheduler::DeleteFile(const std::string& file_path,
", total_trash_size %" PRIu64 " max_trash_db_ratio %lf",
file_path.c_str(), rate_bytes_per_sec_.load(),
total_trash_size_.load(), max_trash_db_ratio_.load());
InstrumentedMutexLock l(&mu_);
RecordTick(stats_.get(), FILES_DELETED_IMMEDIATELY);
}
return s;
@ -90,12 +91,12 @@ Status DeleteScheduler::DeleteFile(const std::string& file_path,
sst_file_manager_->OnDeleteFile(file_path);
ROCKS_LOG_INFO(info_log_, "Deleted file %s immediately",
trash_file.c_str());
InstrumentedMutexLock l(&mu_);
RecordTick(stats_.get(), FILES_DELETED_IMMEDIATELY);
}
return s;
}
RecordTick(stats_.get(), FILES_MARKED_TRASH);
// Update the total trash size
uint64_t trash_file_size = 0;
fs_->GetFileSize(trash_file, IOOptions(), &trash_file_size, nullptr);
@ -104,6 +105,7 @@ Status DeleteScheduler::DeleteFile(const std::string& file_path,
// Add file to delete queue
{
InstrumentedMutexLock l(&mu_);
RecordTick(stats_.get(), FILES_MARKED_TRASH);
queue_.emplace(trash_file, dir_to_sync);
pending_files_++;
if (pending_files_ == 1) {

3
file/delete_scheduler.h
View File

@ -84,6 +84,7 @@ class DeleteScheduler {
const std::string& path);
void SetStatisticsPtr(const std::shared_ptr<Statistics>& stats) {
InstrumentedMutexLock l(&mu_);
stats_ = stats;
}
@ -105,7 +106,7 @@ class DeleteScheduler {
std::atomic<uint64_t> total_trash_size_;
// Maximum number of bytes that should be deleted per second
std::atomic<int64_t> rate_bytes_per_sec_;
// Mutex to protect queue_, pending_files_, bg_errors_, closing_
// Mutex to protect queue_, pending_files_, bg_errors_, closing_, stats_
InstrumentedMutex mu_;
struct FileAndDir {