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

Fail IngestExternalFile when bg_error_ exists

Browse Source 
Summary:
Fail IngestExternalFile() when bg_error_ exists
Closes https://github.com/facebook/rocksdb/pull/1881

Differential Revision: D4580621

Pulled By: IslamAbdelRahman

fbshipit-source-id: 1194913
This commit is contained in:
Islam AbdelRahman 2017-02-17 13:36:46 -08:00 committed by Facebook Github Bot
parent a618a16f44
commit fce7a6e196
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/db_impl.cc
View File

@ -6542,10 +6542,15 @@ Status DBImpl::IngestExternalFile(
immutable_db_options_, env_options_, immutable_db_options_, env_options_,
&snapshots_, ingestion_options); &snapshots_, ingestion_options);
// Make sure that bg cleanup wont delete the files that we are ingesting
std::list<uint64_t>::iterator pending_output_elem; std::list<uint64_t>::iterator pending_output_elem;
{ {
InstrumentedMutexLock l(&mutex_); InstrumentedMutexLock l(&mutex_);
if (!bg_error_.ok()) {
// Don't ingest files when there is a bg_error
return bg_error_;
}
// Make sure that bg cleanup wont delete the files that we are ingesting
pending_output_elem = CaptureCurrentFileNumberInPendingOutputs(); pending_output_elem = CaptureCurrentFileNumberInPendingOutputs();
} }