Add function 'GetInfoLogList()'

Summary: The list of info log files of a db can be obtained using the new function.

Test Plan: New test in db_test.cc passed.

Reviewers: yhchiang, IslamAbdelRahman, sdong

Reviewed By: sdong

Subscribers: IslamAbdelRahman, leveldb, dhruba

Differential Revision: https://reviews.facebook.net/D41715
main
Poornima Chozhiyath Raman 9 years ago
parent 7ccd1c80a7
commit 960d936e83
  1. 56
      db/db_test.cc
  2. 19
      include/rocksdb/utilities/info_log_finder.h
  3. 1
      src.mk
  4. 48
      utilities/convenience/info_log_finder.cc

@ -48,6 +48,7 @@
#include "rocksdb/thread_status.h" #include "rocksdb/thread_status.h"
#include "rocksdb/utilities/write_batch_with_index.h" #include "rocksdb/utilities/write_batch_with_index.h"
#include "rocksdb/utilities/checkpoint.h" #include "rocksdb/utilities/checkpoint.h"
#include "rocksdb/utilities/info_log_finder.h"
#include "rocksdb/utilities/optimistic_transaction_db.h" #include "rocksdb/utilities/optimistic_transaction_db.h"
#include "table/block_based_table_factory.h" #include "table/block_based_table_factory.h"
#include "table/mock_table.h" #include "table/mock_table.h"
@ -3847,9 +3848,19 @@ class WrappedBloom : public FilterPolicy {
}; };
} // namespace } // namespace
<<<<<<< HEAD
TEST_F(DBTest, BloomFilterWrapper) { TEST_F(DBTest, BloomFilterWrapper) {
Options options = CurrentOptions(); Options options = CurrentOptions();
options.statistics = rocksdb::CreateDBStatistics(); options.statistics = rocksdb::CreateDBStatistics();
=======
// Test scope:
// - We expect to open the data store when there is incomplete trailing writes
// at the end of any of the logs
// - We do not expect to open the data store for corruption
TEST_F(DBTest, kTolerateCorruptedTailRecords) {
const int jstart = RecoveryTestHelper::kWALFileOffset;
const int jend = jstart + RecoveryTestHelper::kWALFilesCount;
>>>>>>> Info Log List can be obtained
BlockBasedTableOptions table_options; BlockBasedTableOptions table_options;
WrappedBloom* policy = new WrappedBloom(10); WrappedBloom* policy = new WrappedBloom(10);
@ -3867,12 +3878,21 @@ TEST_F(DBTest, BloomFilterWrapper) {
ASSERT_EQ(0U, policy->GetCounter()); ASSERT_EQ(0U, policy->GetCounter());
Flush(1); Flush(1);
<<<<<<< HEAD
// Check if they can be found // Check if they can be found
for (int i = 0; i < maxKey; i++) { for (int i = 0; i < maxKey; i++) {
ASSERT_EQ(Key(i), Get(1, Key(i))); ASSERT_EQ(Key(i), Get(1, Key(i)));
} }
ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), 0); ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), 0);
ASSERT_EQ(1U * maxKey, policy->GetCounter()); ASSERT_EQ(1U * maxKey, policy->GetCounter());
=======
// Test scope:
// We don't expect the data store to be opened if there is any corruption
// (leading, middle or trailing -- incomplete writes or corruption)
TEST_F(DBTest, kAbsoluteConsistency) {
const int jstart = RecoveryTestHelper::kWALFileOffset;
const int jend = jstart + RecoveryTestHelper::kWALFilesCount;
>>>>>>> Info Log List can be obtained
// Check if filter is useful // Check if filter is useful
for (int i = 0; i < maxKey; i++) { for (int i = 0; i < maxKey; i++) {
@ -3941,6 +3961,18 @@ TEST_F(DBTest, SnapshotFiles) {
} }
CopyFile(src, dest, size); CopyFile(src, dest, size);
} }
<<<<<<< HEAD
=======
}
}
// Test scope:
// - We expect to open the data store under all scenarios
// - We expect to have recovered records past the corruption zone
TEST_F(DBTest, kSkipAnyCorruptedRecords) {
const int jstart = RecoveryTestHelper::kWALFileOffset;
const int jend = jstart + RecoveryTestHelper::kWALFilesCount;
>>>>>>> Info Log List can be obtained
// release file snapshot // release file snapshot
dbfull()->DisableFileDeletions(); dbfull()->DisableFileDeletions();
@ -5912,6 +5944,7 @@ TEST_F(DBTest, DBIteratorBoundTest) {
} }
} }
<<<<<<< HEAD
TEST_F(DBTest, WriteSingleThreadEntry) { TEST_F(DBTest, WriteSingleThreadEntry) {
std::vector<std::thread> threads; std::vector<std::thread> threads;
dbfull()->TEST_LockMutex(); dbfull()->TEST_LockMutex();
@ -5928,6 +5961,29 @@ TEST_F(DBTest, WriteSingleThreadEntry) {
for (auto& t : threads) { for (auto& t : threads) {
t.join(); t.join();
} }
=======
TEST_F(DBTest, InfoLogFileList) {
Options options = CurrentOptions();
options.db_log_dir = test::TmpDir(env_);
options.max_background_flushes = 0;
CreateAndReopenWithCF({"pikachu"}, options);
ASSERT_OK(Put(1, "key", "value"));
std::vector<std::string> result;
auto s = GetInfoLogList(db_, &result);
ASSERT_TRUE(s.ok());
ASSERT_GT(result.size(), 0);
}
TEST_F(DBTest, PreShutdownFlush) {
Options options = CurrentOptions();
options.max_background_flushes = 0;
CreateAndReopenWithCF({"pikachu"}, options);
ASSERT_OK(Put(1, "key", "value"));
CancelAllBackgroundWork(db_);
Status s =
db_->CompactRange(CompactRangeOptions(), handles_[1], nullptr, nullptr);
ASSERT_TRUE(s.IsShutdownInProgress());
>>>>>>> Info Log List can be obtained
} }
TEST_F(DBTest, DisableDataSyncTest) { TEST_F(DBTest, DisableDataSyncTest) {

@ -0,0 +1,19 @@
// Copyright (c) 2014, Facebook, Inc. All rights reserved.
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree. An additional grant
// of patent rights can be found in the PATENTS file in the same directory.
#pragma once
#include <string>
#include <vector>
#include "rocksdb/db.h"
#include "rocksdb/options.h"
namespace rocksdb {
// This function can be used to list the Information logs,
// given the db pointer.
Status GetInfoLogList(DB* db, std::vector<std::string>* info_log_list);
} // namespace rocksdb

@ -99,6 +99,7 @@ LIB_SOURCES = \
util/instrumented_mutex.cc \ util/instrumented_mutex.cc \
util/iostats_context.cc \ util/iostats_context.cc \
utilities/backupable/backupable_db.cc \ utilities/backupable/backupable_db.cc \
utilities/convenience/info_log_finder.cc \
utilities/checkpoint/checkpoint.cc \ utilities/checkpoint/checkpoint.cc \
utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc \ utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc \
utilities/document/document_db.cc \ utilities/document/document_db.cc \

@ -0,0 +1,48 @@
// Copyright (c) 2013, Facebook, Inc. All rights reserved.
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree. An additional grant
// of patent rights can be found in the PATENTS file in the same directory.
//
// Copyright (c) 2012 Facebook.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "db/filename.h"
#include "rocksdb/env.h"
#include "rocksdb/utilities/info_log_finder.h"
namespace rocksdb {
Status GetInfoLogList(DB* db, std::vector<std::string>* info_log_list) {
uint64_t number = 0;
FileType type;
std::string path;
if (!db) {
return Status::InvalidArgument("DB pointer is not valid");
}
const Options& options = db->GetOptions();
if (!options.db_log_dir.empty()) {
path = options.db_log_dir;
} else {
path = db->GetName();
}
InfoLogPrefix info_log_prefix(!options.db_log_dir.empty(), db->GetName());
auto* env = options.env;
std::vector<std::string> file_names;
Status s = env->GetChildren(path, &file_names);
if (!s.ok()) {
return s;
}
for (auto f : file_names) {
if (ParseFileName(f, &number, info_log_prefix.prefix, &type) &&
(type == kInfoLogFile)) {
info_log_list->push_back(f);
}
}
return Status::OK();
}
} // namespace rocksdb
Loading…
Cancel
Save