andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move away from direct TmpDir() call in some tests (#7030)

Browse Source 
Summary:
Some tests directly uses TmpDir() as temporary directory without adding any randomize factor. This would cause failures when tests run in parallel. Fix it by moving some of them to test::PerThreadDBPath()
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7030

Test Plan: Watch existing tests pass

Reviewed By: zhichao-cao

Differential Revision: D22224710

fbshipit-source-id: 28c9932fede0a4a64670e5b5fdb08f4fb5dccdd0
This commit is contained in:
sdong 2020-06-25 12:07:47 -07:00 committed by Facebook GitHub Bot
parent 63b59f21d9
commit d64cf0e4ee
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/db_test2.cc
View File

@ -3566,7 +3566,7 @@ TEST_F(DBTest2, TraceAndReplay) {
// Open another db, replay, and verify the data // Open another db, replay, and verify the data
std::string value; std::string value;
std::string dbname2 = test::TmpDir(env_) + "/db_replay"; std::string dbname2 = test::PerThreadDBPath(env_, "/db_replay");
ASSERT_OK(DestroyDB(dbname2, options)); ASSERT_OK(DestroyDB(dbname2, options));
// Using a different name than db2, to pacify infer's use-after-lifetime // Using a different name than db2, to pacify infer's use-after-lifetime
@ -3640,7 +3640,7 @@ TEST_F(DBTest2, TraceWithLimit) {
ASSERT_OK(Put(0, "c", "1")); ASSERT_OK(Put(0, "c", "1"));
ASSERT_OK(db_->EndTrace()); ASSERT_OK(db_->EndTrace());
std::string dbname2 = test::TmpDir(env_) + "/db_replay2"; std::string dbname2 = test::PerThreadDBPath(env_, "/db_replay2");
std::string value; std::string value;
ASSERT_OK(DestroyDB(dbname2, options)); ASSERT_OK(DestroyDB(dbname2, options));
@ -3709,7 +3709,7 @@ TEST_F(DBTest2, TraceWithSampling) {
ASSERT_OK(Put(0, "e", "5")); ASSERT_OK(Put(0, "e", "5"));
ASSERT_OK(db_->EndTrace()); ASSERT_OK(db_->EndTrace());
std::string dbname2 = test::TmpDir(env_) + "/db_replay_sampling"; std::string dbname2 = test::PerThreadDBPath(env_, "/db_replay_sampling");
std::string value; std::string value;
ASSERT_OK(DestroyDB(dbname2, options)); ASSERT_OK(DestroyDB(dbname2, options));

9
env/env_test.cc vendored
View File

@ -1602,9 +1602,10 @@ TEST_P(EnvPosixTestWithParam, ConsistentChildrenAttributes) {
const int kNumChildren = 10; const int kNumChildren = 10;
std::string data; std::string data;
std::string test_base_dir = test::PerThreadDBPath(env_, "env_test_chr_attr");
env_->CreateDir(test_base_dir);
for (int i = 0; i < kNumChildren; ++i) { for (int i = 0; i < kNumChildren; ++i) {
const std::string path = const std::string path = test_base_dir + "/testfile_" + std::to_string(i);
test::TmpDir(env_) + "/" + "testfile_" + std::to_string(i);
std::unique_ptr<WritableFile> file; std::unique_ptr<WritableFile> file;
#if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_SOLARIS) && !defined(OS_AIX) && !defined(OS_OPENBSD) && !defined(OS_FREEBSD) #if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_SOLARIS) && !defined(OS_AIX) && !defined(OS_OPENBSD) && !defined(OS_FREEBSD)
if (soptions.use_direct_writes) { if (soptions.use_direct_writes) {
@ -1623,10 +1624,10 @@ TEST_P(EnvPosixTestWithParam, ConsistentChildrenAttributes) {
} }
std::vector<Env::FileAttributes> file_attrs; std::vector<Env::FileAttributes> file_attrs;
ASSERT_OK(env_->GetChildrenFileAttributes(test::TmpDir(env_), &file_attrs)); ASSERT_OK(env_->GetChildrenFileAttributes(test_base_dir, &file_attrs));
for (int i = 0; i < kNumChildren; ++i) { for (int i = 0; i < kNumChildren; ++i) {
const std::string name = "testfile_" + std::to_string(i); const std::string name = "testfile_" + std::to_string(i);
const std::string path = test::TmpDir(env_) + "/" + name; const std::string path = test_base_dir + "/" + name;
auto file_attrs_iter = std::find_if( auto file_attrs_iter = std::find_if(
file_attrs.begin(), file_attrs.end(), file_attrs.begin(), file_attrs.end(),

12
tools/ldb_cmd_test.cc
View File

@ -94,7 +94,7 @@ TEST_F(LdbCmdTest, MemEnv) {
opts.create_if_missing = true; opts.create_if_missing = true;
DB* db = nullptr; DB* db = nullptr;
std::string dbname = test::TmpDir(); std::string dbname = test::PerThreadDBPath(env.get(), "ldb_cmd_test");
ASSERT_OK(DB::Open(opts, dbname, &db)); ASSERT_OK(DB::Open(opts, dbname, &db));
WriteOptions wopts; WriteOptions wopts;
@ -274,7 +274,7 @@ TEST_F(LdbCmdTest, DumpFileChecksumNoChecksum) {
opts.create_if_missing = true; opts.create_if_missing = true;
DB* db = nullptr; DB* db = nullptr;
std::string dbname = test::TmpDir(); std::string dbname = test::PerThreadDBPath(env.get(), "ldb_cmd_test");
ASSERT_OK(DB::Open(opts, dbname, &db)); ASSERT_OK(DB::Open(opts, dbname, &db));
WriteOptions wopts; WriteOptions wopts;
@ -359,7 +359,7 @@ TEST_F(LdbCmdTest, DumpFileChecksumCRC32) {
opts.file_checksum_gen_factory = GetFileChecksumGenCrc32cFactory(); opts.file_checksum_gen_factory = GetFileChecksumGenCrc32cFactory();
DB* db = nullptr; DB* db = nullptr;
std::string dbname = test::TmpDir(); std::string dbname = test::PerThreadDBPath(env.get(), "ldb_cmd_test");
ASSERT_OK(DB::Open(opts, dbname, &db)); ASSERT_OK(DB::Open(opts, dbname, &db));
WriteOptions wopts; WriteOptions wopts;
@ -482,7 +482,7 @@ TEST_F(LdbCmdTest, ListFileTombstone) {
opts.create_if_missing = true; opts.create_if_missing = true;
DB* db = nullptr; DB* db = nullptr;
std::string dbname = test::TmpDir(); std::string dbname = test::PerThreadDBPath(env.get(), "ldb_cmd_test");
ASSERT_OK(DB::Open(opts, dbname, &db)); ASSERT_OK(DB::Open(opts, dbname, &db));
WriteOptions wopts; WriteOptions wopts;
@ -571,7 +571,7 @@ TEST_F(LdbCmdTest, DisableConsistencyChecks) {
opts.env = env.get(); opts.env = env.get();
opts.create_if_missing = true; opts.create_if_missing = true;
std::string dbname = test::TmpDir(); std::string dbname = test::PerThreadDBPath(env.get(), "ldb_cmd_test");
{ {
DB* db = nullptr; DB* db = nullptr;
@ -663,7 +663,7 @@ TEST_F(LdbCmdTest, TestBadDbPath) {
opts.env = env.get(); opts.env = env.get();
opts.create_if_missing = true; opts.create_if_missing = true;
std::string dbname = test::TmpDir(); std::string dbname = test::PerThreadDBPath(env.get(), "ldb_cmd_test");
char arg1[] = "./ldb"; char arg1[] = "./ldb";
char arg2[1024]; char arg2[1024];
snprintf(arg2, sizeof(arg2), "--db=%s/.no_such_dir", dbname.c_str()); snprintf(arg2, sizeof(arg2), "--db=%s/.no_such_dir", dbname.c_str());

2
utilities/checkpoint/checkpoint_test.cc
View File

@ -68,7 +68,7 @@ class CheckpointTest : public testing::Test {
EXPECT_OK(DestroyDB(snapshot_tmp_name, options)); EXPECT_OK(DestroyDB(snapshot_tmp_name, options));
env_->DeleteDir(snapshot_tmp_name); env_->DeleteDir(snapshot_tmp_name);
Reopen(options); Reopen(options);
export_path_ = test::TmpDir(env_) + "/export"; export_path_ = test::PerThreadDBPath("/export");
test::DestroyDir(env_, export_path_); test::DestroyDir(env_, export_path_);
cfh_reverse_comp_ = nullptr; cfh_reverse_comp_ = nullptr;
metadata_ = nullptr; metadata_ = nullptr;