Summary: This patch allows rocksdb to persist options into a file on DB::Open, SetOptions, and Create / Drop ColumnFamily. Options files are created under the same directory as the rocksdb instance. In addition, this patch also adds a fail_if_missing_options_file in DBOptions that makes any function call return non-ok status when it is not able to persist options properly. // If true, then DB::Open / CreateColumnFamily / DropColumnFamily // / SetOptions will fail if options file is not detected or properly // persisted. // // DEFAULT: false bool fail_if_missing_options_file; Options file names are formatted as OPTIONS-<number>, and RocksDB will always keep the latest two options files. Test Plan: Add options_file_test. options_test column_family_test Reviewers: igor, IslamAbdelRahman, sdong, anthony Reviewed By: anthony Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D48285main
Yueh-Hsuan Chiang
9 years ago
parent
7ed2c3e45b
commit
e114f0abb8
@ -0,0 +1,116 @@ |
||||
// Copyright (c) 2015, 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.
|
||||
|
||||
#ifndef ROCKSDB_LITE |
||||
#include <string> |
||||
|
||||
#include "db/db_impl.h" |
||||
#include "db/db_test_util.h" |
||||
#include "rocksdb/options.h" |
||||
#include "rocksdb/table.h" |
||||
#include "util/testharness.h" |
||||
|
||||
namespace rocksdb { |
||||
class OptionsFileTest : public testing::Test { |
||||
public: |
||||
OptionsFileTest() : dbname_(test::TmpDir() + "/options_file_test") {} |
||||
|
||||
std::string dbname_; |
||||
}; |
||||
|
||||
namespace { |
||||
void UpdateOptionsFiles(DB* db, |
||||
std::unordered_set<std::string>* filename_history, |
||||
int* options_files_count) { |
||||
std::vector<std::string> filenames; |
||||
db->GetEnv()->GetChildren(db->GetName(), &filenames); |
||||
uint64_t number; |
||||
FileType type; |
||||
*options_files_count = 0; |
||||
for (auto filename : filenames) { |
||||
if (ParseFileName(filename, &number, &type) && type == kOptionsFile) { |
||||
filename_history->insert(filename); |
||||
(*options_files_count)++; |
||||
} |
||||
} |
||||
} |
||||
|
||||
// Verify whether the current Options Files are the latest ones.
|
||||
void VerifyOptionsFileName( |
||||
DB* db, const std::unordered_set<std::string>& past_filenames) { |
||||
std::vector<std::string> filenames; |
||||
std::unordered_set<std::string> current_filenames; |
||||
db->GetEnv()->GetChildren(db->GetName(), &filenames); |
||||
uint64_t number; |
||||
FileType type; |
||||
for (auto filename : filenames) { |
||||
if (ParseFileName(filename, &number, &type) && type == kOptionsFile) { |
||||
current_filenames.insert(filename); |
||||
} |
||||
} |
||||
for (auto past_filename : past_filenames) { |
||||
if (current_filenames.find(past_filename) != current_filenames.end()) { |
||||
continue; |
||||
} |
||||
for (auto filename : current_filenames) { |
||||
ASSERT_GT(filename, past_filename); |
||||
} |
||||
} |
||||
} |
||||
} // namespace
|
||||
|
||||
TEST_F(OptionsFileTest, NumberOfOptionsFiles) { |
||||
const int kReopenCount = 20; |
||||
Options opt; |
||||
opt.create_if_missing = true; |
||||
DestroyDB(dbname_, opt); |
||||
std::unordered_set<std::string> filename_history; |
||||
DB* db; |
||||
for (int i = 0; i < kReopenCount; ++i) { |
||||
ASSERT_OK(DB::Open(opt, dbname_, &db)); |
||||
int num_options_files = 0; |
||||
UpdateOptionsFiles(db, &filename_history, &num_options_files); |
||||
ASSERT_GT(num_options_files, 0); |
||||
ASSERT_LE(num_options_files, 2); |
||||
// Make sure we always keep the latest option files.
|
||||
VerifyOptionsFileName(db, filename_history); |
||||
delete db; |
||||
} |
||||
} |
||||
|
||||
TEST_F(OptionsFileTest, OptionsFileName) { |
||||
const uint64_t kOptionsFileNum = 12345; |
||||
uint64_t number; |
||||
FileType type; |
||||
|
||||
auto options_file_name = OptionsFileName("", kOptionsFileNum); |
||||
ASSERT_TRUE(ParseFileName(options_file_name, &number, &type, nullptr)); |
||||
ASSERT_EQ(type, kOptionsFile); |
||||
ASSERT_EQ(number, kOptionsFileNum); |
||||
|
||||
const uint64_t kTempOptionsFileNum = 54352; |
||||
auto temp_options_file_name = TempOptionsFileName("", kTempOptionsFileNum); |
||||
ASSERT_TRUE(ParseFileName(temp_options_file_name, &number, &type, nullptr)); |
||||
ASSERT_NE(temp_options_file_name.find(kTempFileNameSuffix), |
||||
std::string::npos); |
||||
ASSERT_EQ(type, kTempFile); |
||||
ASSERT_EQ(number, kTempOptionsFileNum); |
||||
} |
||||
} // namespace rocksdb
|
||||
|
||||
int main(int argc, char** argv) { |
||||
#if !(defined NDEBUG) || !defined(OS_WIN) |
||||
::testing::InitGoogleTest(&argc, argv); |
||||
return RUN_ALL_TESTS(); |
||||
#else |
||||
return 0; |
||||
#endif // !(defined NDEBUG) || !defined(OS_WIN)
|
||||
} |
||||
#else |
||||
int main(int argc, char** argv) { |
||||
printf("Skipped as Options file is not supported in RocksDBLite.\n"); |
||||
return 0; |
||||
} |
||||
#endif // !ROCKSDB_LITE
|
||||
Loading…
Reference in new issue