Skip to content

Commit

Permalink
Avoid blob db call Sync() while writing
Browse files Browse the repository at this point in the history
Summary:
The FsyncFiles background job call Fsync() periodically for blob files. However it can access WritableFileWriter concurrently with a Put() or Write(). And WritableFileWriter does not support concurrent access. It will lead to WritableFileWriter buffer being flush with same content twice, and blob file end up corrupted. Fixing by simply let FsyncFiles hold write_mutex_.
Closes facebook#2685

Differential Revision: D5561908

Pulled By: yiwu-arbug

fbshipit-source-id: f0bb5bcab0e05694e053b8c49eab43640721e872
  • Loading branch information
Yi Wu authored and facebook-github-bot committed Aug 4, 2017
1 parent 627c9f1 commit 0d4a2b7
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions utilities/blob_db/blob_db_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -545,12 +545,7 @@ Status BlobDBImpl::CreateWriterLocked(const std::shared_ptr<BlobFile>& bfile) {
std::string fpath(bfile->PathName());
std::unique_ptr<WritableFile> wfile;

// We are having issue that we write duplicate blob to blob file and the bug
// is related to writable file buffer. Force no buffer until we fix the bug.
EnvOptions env_options = env_options_;
env_options.writable_file_max_buffer_size = 0;

Status s = env_->ReopenWritableFile(fpath, &wfile, env_options);
Status s = env_->ReopenWritableFile(fpath, &wfile, env_options_);
if (!s.ok()) {
ROCKS_LOG_ERROR(db_options_.info_log,
"Failed to open blob file for write: %s status: '%s'"
Expand All @@ -561,7 +556,7 @@ Status BlobDBImpl::CreateWriterLocked(const std::shared_ptr<BlobFile>& bfile) {
}

std::unique_ptr<WritableFileWriter> fwriter;
fwriter.reset(new WritableFileWriter(std::move(wfile), env_options));
fwriter.reset(new WritableFileWriter(std::move(wfile), env_options_));

uint64_t boffset = bfile->GetFileSize();
if (debug_level_ >= 2 && boffset) {
Expand Down Expand Up @@ -1570,6 +1565,8 @@ std::pair<bool, int64_t> BlobDBImpl::CheckSeqFiles(bool aborted) {
std::pair<bool, int64_t> BlobDBImpl::FsyncFiles(bool aborted) {
if (aborted) return std::make_pair(false, -1);

MutexLock l(&write_mutex_);

std::vector<std::shared_ptr<BlobFile>> process_files;
{
ReadLock rl(&mutex_);
Expand Down

0 comments on commit 0d4a2b7

Please sign in to comment.