From c90fef88b1c5bc0fcc696301622f0fcf3fa17a03 Mon Sep 17 00:00:00 2001 From: Andrew Kryczka Date: Wed, 9 Nov 2016 22:10:06 -0800 Subject: [PATCH] fix open failure with empty wal Summary: Closes https://github.com/facebook/rocksdb/pull/1490 Differential Revision: D4158821 Pulled By: IslamAbdelRahman fbshipit-source-id: 59b73f4 --- db/column_family_test.cc | 6 ++++++ db/db_impl.cc | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/db/column_family_test.cc b/db/column_family_test.cc index 9db46c61d..aaf511b6e 100644 --- a/db/column_family_test.cc +++ b/db/column_family_test.cc @@ -941,6 +941,12 @@ TEST_F(ColumnFamilyTest, CrashAfterFlush) { db_options_.env = env_; } +TEST_F(ColumnFamilyTest, OpenNonexistentColumnFamily) { + ASSERT_OK(TryOpen({"default"})); + Close(); + ASSERT_TRUE(TryOpen({"default", "dne"}).IsInvalidArgument()); +} + #ifndef ROCKSDB_LITE // WaitForFlush() is not supported // Makes sure that obsolete log files get deleted TEST_F(ColumnFamilyTest, DifferentWriteBufferSizes) { diff --git a/db/db_impl.cc b/db/db_impl.cc index f202d1fa6..b2941848a 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -1688,6 +1688,9 @@ Status DBImpl::RecoverLogFiles(const std::vector& log_numbers, } } + // True if there's any data in the WALs; if not, we can skip re-processing + // them later + bool data_seen = false; if (!read_only) { // no need to refcount since client still doesn't have access // to the DB and can not drop column families while we iterate @@ -1723,6 +1726,7 @@ Status DBImpl::RecoverLogFiles(const std::vector& log_numbers, cfd->CreateNewMemtable(*cfd->GetLatestMutableCFOptions(), versions_->LastSequence()); } + data_seen = true; } // write MANIFEST with update @@ -1748,7 +1752,7 @@ Status DBImpl::RecoverLogFiles(const std::vector& log_numbers, } } - if (!flushed) { + if (data_seen && !flushed) { // Mark these as alive so they'll be considered for deletion later by // FindObsoleteFiles() for (auto log_number : log_numbers) {