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

fix delete file bug when do checkpoint (#1138)

Browse Source
This commit is contained in:
Zuoyan Qin 2016-05-30 05:26:55 +08:00 committed by Andrew Kryczka
parent 8dfa980cba
commit 590e2617ee
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utilities/checkpoint/checkpoint.cc
View File

@ -211,15 +211,14 @@ Status CheckpointImpl::CreateCheckpoint(const std::string& checkpoint_dir) {
std::vector<std::string> subchildren; std::vector<std::string> subchildren;
db_->GetEnv()->GetChildren(full_private_path, &subchildren); db_->GetEnv()->GetChildren(full_private_path, &subchildren);
for (auto& subchild : subchildren) { for (auto& subchild : subchildren) {
Status s1 = db_->GetEnv()->DeleteFile(full_private_path + subchild); std::string subchild_path = full_private_path + "/" + subchild;
if (s1.ok()) { Status s1 = db_->GetEnv()->DeleteFile(subchild_path);
Log(db_->GetOptions().info_log, "Deleted %s", Log(db_->GetOptions().info_log, "Delete file %s -- %s",
(full_private_path + subchild).c_str()); subchild_path.c_str(), s1.ToString().c_str());
}
} }
// finally delete the private dir // finally delete the private dir
Status s1 = db_->GetEnv()->DeleteDir(full_private_path); Status s1 = db_->GetEnv()->DeleteDir(full_private_path);
Log(db_->GetOptions().info_log, "Deleted dir %s -- %s", Log(db_->GetOptions().info_log, "Delete dir %s -- %s",
full_private_path.c_str(), s1.ToString().c_str()); full_private_path.c_str(), s1.ToString().c_str());
return s; return s;
} }