From ee4b9966bcf95741c4c822e6924352f7f2e77ffc Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Wed, 12 Mar 2014 13:47:07 -0700 Subject: [PATCH] DeleteLogFiles in FailOverwritingBackups --- utilities/backupable/backupable_db_test.cc | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/utilities/backupable/backupable_db_test.cc b/utilities/backupable/backupable_db_test.cc index 74e703e9eb..4ed7fb1aa7 100644 --- a/utilities/backupable/backupable_db_test.cc +++ b/utilities/backupable/backupable_db_test.cc @@ -424,6 +424,19 @@ class BackupableDBTest { } } + void DeleteLogFiles() { + std::vector delete_logs; + env_->GetChildren(dbname_, &delete_logs); + for (auto f : delete_logs) { + uint64_t number; + FileType type; + bool ok = ParseFileName(f, &number, &type); + if (ok && type == kLogFile) { + env_->DeleteFile(dbname_ + "/" + f); + } + } + } + // files std::string dbname_; std::string backupdir_; @@ -720,12 +733,11 @@ TEST(BackupableDBTest, FailOverwritingBackups) { // create backups 1, 2, 3, 4, 5 OpenBackupableDB(true); for (int i = 0; i < 5; ++i) { + CloseBackupableDB(); + DeleteLogFiles(); + OpenBackupableDB(false); FillDB(db_.get(), 100 * i, 100 * (i + 1)); - CloseBackupableDB(); - OpenBackupableDB(false); ASSERT_OK(db_->CreateNewBackup(true)); - CloseBackupableDB(); - OpenBackupableDB(false); } CloseBackupableDB();