From: sdong <siying.d@fb.com>
Date: Wed, 13 Aug 2014 01:26:20 +0000 (-0700)
Subject: Revert "Include candidate files under options.db_log_dir in FindObsoleteFiles()"
X-Git-Tag: rocksdb-3.4~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55935c8d8e78f5055325c637b007e20d076442cc;p=rocksdb.git

Revert "Include candidate files under options.db_log_dir in FindObsoleteFiles()"

This reverts commit 54153ab07abcd9265a8f4d77d3e984d2932404d0.
---

diff --git a/db/db_impl.cc b/db/db_impl.cc
index 95c77ff52..c22b45d45 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -579,14 +579,6 @@ void DBImpl::FindObsoleteFiles(DeletionState& deletion_state,
         deletion_state.candidate_files.emplace_back(log_file, 0);
       }
     }
-    // Add info log files in db_log_dir
-    if (options_.db_log_dir.empty() && options_.db_log_dir != dbname_) {
-      std::vector<std::string> info_log_files;
-      env_->GetChildren(options_.db_log_dir, &info_log_files);  // Ignore errors
-      for (std::string log_file : info_log_files) {
-        deletion_state.candidate_files.emplace_back(log_file, 0);
-      }
-    }
   }
 }