From fd0d35d390e212b617e90d7567102d3e5fd1c706 Mon Sep 17 00:00:00 2001 From: Jay Zhuang Date: Mon, 21 Dec 2020 08:45:54 -0800 Subject: [PATCH] Fix block_cache_test failure (#7783) Summary: `block_cache_tracer_test` and `block_cache_trace_analyzer_test` are using the same test directory. Which causes build failure if these 2 tests are running in parallel, for example: https://app.circleci.com/pipelines/github/facebook/rocksdb/5211/workflows/8639afbe-9fec-43e2-a6a4-6d47ea9cbcbe/jobs/74598/tests Pull Request resolved: https://github.com/facebook/rocksdb/pull/7783 Reviewed By: akankshamahajan15 Differential Revision: D25656762 Pulled By: jay-zhuang fbshipit-source-id: 68aa020aa5b4b3bce324315edecb4e1a60cc18e6 --- CMakeLists.txt | 1 + tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed717c2b45..929073c388 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1174,6 +1174,7 @@ if(WITH_TESTS) table/table_test.cc table/block_fetcher_test.cc test_util/testutil_test.cc + trace_replay/block_cache_tracer_test.cc trace_replay/io_tracer_test.cc tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc tools/io_tracer_parser_test.cc diff --git a/tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc b/tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc index c26795d60a..442a6370eb 100644 --- a/tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc +++ b/tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc @@ -44,7 +44,7 @@ const size_t kArgBufferSize = 100000; class BlockCacheTracerTest : public testing::Test { public: BlockCacheTracerTest() { - test_path_ = test::PerThreadDBPath("block_cache_tracer_test"); + test_path_ = test::PerThreadDBPath("block_cache_trace_analyzer_test"); env_ = ROCKSDB_NAMESPACE::Env::Default(); EXPECT_OK(env_->CreateDir(test_path_)); trace_file_path_ = test_path_ + "/block_cache_trace";