This is an automated email from the ASF dual-hosted git repository.
adar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new b6a2985 fs: remove test-only constructor
b6a2985 is described below
commit b6a298558ef1fc1218c16b68b3031b3646f7e6db
Author: Adar Dembo <[email protected]>
AuthorDate: Fri Jan 10 16:32:37 2020 -0800
fs: remove test-only constructor
Change-Id: I11024a2f28123bba3e3989ddd5e68f581481d5fb
Reviewed-on: http://gerrit.cloudera.org:8080/15010
Tested-by: Kudu Jenkins
Reviewed-by: Alexey Serbin <[email protected]>
---
src/kudu/cfile/bloomfile-test-base.h | 2 +-
src/kudu/cfile/cfile-test-base.h | 2 +-
src/kudu/consensus/consensus_meta-test.cc | 7 +++++--
.../consensus_meta_manager-stress-test.cc | 2 +-
src/kudu/consensus/consensus_meta_manager-test.cc | 10 ++++++----
src/kudu/consensus/consensus_peers-test.cc | 2 +-
src/kudu/consensus/consensus_queue-test.cc | 2 +-
src/kudu/consensus/log-test-base.h | 2 +-
src/kudu/consensus/log_cache-test.cc | 2 +-
src/kudu/fs/fs_manager.cc | 10 ++--------
src/kudu/fs/fs_manager.h | 4 +---
src/kudu/tablet/compaction-test.cc | 2 +-
src/kudu/tablet/delta_compaction-test.cc | 3 ++-
src/kudu/tablet/deltafile-test.cc | 3 +--
src/kudu/tablet/deltamemstore-test.cc | 2 +-
src/kudu/tablet/tablet-harness.h | 2 +-
src/kudu/tools/kudu-tool-test.cc | 22 +++++++++++-----------
17 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/src/kudu/cfile/bloomfile-test-base.h
b/src/kudu/cfile/bloomfile-test-base.h
index 74251b1..d1dd381 100644
--- a/src/kudu/cfile/bloomfile-test-base.h
+++ b/src/kudu/cfile/bloomfile-test-base.h
@@ -48,7 +48,7 @@ class BloomFileTestBase : public KuduTest {
void SetUp() OVERRIDE {
KuduTest::SetUp();
- fs_manager_.reset(new FsManager(env_, GetTestPath("fs_root")));
+ fs_manager_.reset(new FsManager(env_,
FsManagerOpts(GetTestPath("fs_root"))));
ASSERT_OK(fs_manager_->CreateInitialFileSystemLayout());
ASSERT_OK(fs_manager_->Open());
}
diff --git a/src/kudu/cfile/cfile-test-base.h b/src/kudu/cfile/cfile-test-base.h
index ae924db..7f14621 100644
--- a/src/kudu/cfile/cfile-test-base.h
+++ b/src/kudu/cfile/cfile-test-base.h
@@ -343,7 +343,7 @@ class CFileTestBase : public KuduTest {
void SetUp() OVERRIDE {
KuduTest::SetUp();
- fs_manager_.reset(new FsManager(env_, GetTestPath("fs_root")));
+ fs_manager_.reset(new FsManager(env_,
FsManagerOpts(GetTestPath("fs_root"))));
ASSERT_OK(fs_manager_->CreateInitialFileSystemLayout());
ASSERT_OK(fs_manager_->Open());
}
diff --git a/src/kudu/consensus/consensus_meta-test.cc
b/src/kudu/consensus/consensus_meta-test.cc
index 3fdc6b6..96aab15 100644
--- a/src/kudu/consensus/consensus_meta-test.cc
+++ b/src/kudu/consensus/consensus_meta-test.cc
@@ -15,18 +15,21 @@
// specific language governing permissions and limitations
// under the License.
+#include "kudu/consensus/consensus_meta.h"
+
#include <cstddef>
#include <cstdint>
+#include <initializer_list>
#include <memory>
#include <ostream>
#include <string>
+#include <utility>
#include <vector>
#include <glog/logging.h>
#include <gtest/gtest.h>
#include "kudu/common/wire_protocol.h"
-#include "kudu/consensus/consensus_meta.h"
#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid_util.h"
#include "kudu/consensus/quorum_util.h"
@@ -52,7 +55,7 @@ const int64_t kInitialTerm = 3;
class ConsensusMetadataTest : public KuduTest {
public:
ConsensusMetadataTest()
- : fs_manager_(env_, GetTestPath("fs_root")) {
+ : fs_manager_(env_, FsManagerOpts(GetTestPath("fs_root"))) {
}
virtual void SetUp() OVERRIDE {
diff --git a/src/kudu/consensus/consensus_meta_manager-stress-test.cc
b/src/kudu/consensus/consensus_meta_manager-stress-test.cc
index 5176ba4..c0622de 100644
--- a/src/kudu/consensus/consensus_meta_manager-stress-test.cc
+++ b/src/kudu/consensus/consensus_meta_manager-stress-test.cc
@@ -65,7 +65,7 @@ class ConsensusMetadataManagerStressTest : public KuduTest {
public:
ConsensusMetadataManagerStressTest()
: rng_(SeedRandom()),
- fs_manager_(env_, GetTestPath("fs_root")),
+ fs_manager_(env_, FsManagerOpts(GetTestPath("fs_root"))),
cmeta_manager_(new ConsensusMetadataManager(&fs_manager_)) {
}
diff --git a/src/kudu/consensus/consensus_meta_manager-test.cc
b/src/kudu/consensus/consensus_meta_manager-test.cc
index 4f84f53..8f14ba6 100644
--- a/src/kudu/consensus/consensus_meta_manager-test.cc
+++ b/src/kudu/consensus/consensus_meta_manager-test.cc
@@ -15,22 +15,24 @@
// specific language governing permissions and limitations
// under the License.
+#include "kudu/consensus/consensus_meta_manager.h"
+
#include <cstdint>
+#include <initializer_list>
#include <string>
#include <google/protobuf/util/message_differencer.h>
#include <gtest/gtest.h>
#include "kudu/consensus/consensus_meta.h"
-#include "kudu/consensus/consensus_meta_manager.h"
#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid_util.h"
#include "kudu/consensus/quorum_util.h"
#include "kudu/fs/fs_manager.h"
-#include "kudu/util/test_macros.h"
-#include "kudu/util/test_util.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
+#include "kudu/util/test_util.h"
using google::protobuf::util::MessageDifferencer;
@@ -44,7 +46,7 @@ static const int64_t kInitialTerm = 1;
class ConsensusMetadataManagerTest : public KuduTest {
public:
ConsensusMetadataManagerTest()
- : fs_manager_(env_, GetTestPath("fs_root")),
+ : fs_manager_(env_, FsManagerOpts(GetTestPath("fs_root"))),
cmeta_manager_(new ConsensusMetadataManager(&fs_manager_)) {
}
diff --git a/src/kudu/consensus/consensus_peers-test.cc
b/src/kudu/consensus/consensus_peers-test.cc
index a05c921..8ac75a8 100644
--- a/src/kudu/consensus/consensus_peers-test.cc
+++ b/src/kudu/consensus/consensus_peers-test.cc
@@ -81,7 +81,7 @@ class ConsensusPeersTest : public KuduTest {
virtual void SetUp() OVERRIDE {
KuduTest::SetUp();
- fs_manager_.reset(new FsManager(env_, GetTestPath("fs_root")));
+ fs_manager_.reset(new FsManager(env_,
FsManagerOpts(GetTestPath("fs_root"))));
ASSERT_OK(fs_manager_->CreateInitialFileSystemLayout());
ASSERT_OK(fs_manager_->Open());
ASSERT_OK(Log::Open(options_,
diff --git a/src/kudu/consensus/consensus_queue-test.cc
b/src/kudu/consensus/consensus_queue-test.cc
index b47c52e..094f2cc 100644
--- a/src/kudu/consensus/consensus_queue-test.cc
+++ b/src/kudu/consensus/consensus_queue-test.cc
@@ -83,7 +83,7 @@ class ConsensusQueueTest : public KuduTest {
virtual void SetUp() OVERRIDE {
KuduTest::SetUp();
- fs_manager_.reset(new FsManager(env_, GetTestPath("fs_root")));
+ fs_manager_.reset(new FsManager(env_,
FsManagerOpts(GetTestPath("fs_root"))));
ASSERT_OK(fs_manager_->CreateInitialFileSystemLayout());
ASSERT_OK(fs_manager_->Open());
CHECK_OK(log::Log::Open(log::LogOptions(),
diff --git a/src/kudu/consensus/log-test-base.h
b/src/kudu/consensus/log-test-base.h
index a843e77..62f3284 100644
--- a/src/kudu/consensus/log-test-base.h
+++ b/src/kudu/consensus/log-test-base.h
@@ -153,7 +153,7 @@ class LogTestBase : public KuduTest {
void SetUp() override {
KuduTest::SetUp();
current_index_ = kStartIndex;
- fs_manager_.reset(new FsManager(env_, GetTestPath("fs_root")));
+ fs_manager_.reset(new FsManager(env_,
FsManagerOpts(GetTestPath("fs_root"))));
metric_registry_.reset(new MetricRegistry());
metric_entity_ = METRIC_ENTITY_tablet.Instantiate(metric_registry_.get(),
"log-test-base");
ASSERT_OK(fs_manager_->CreateInitialFileSystemLayout());
diff --git a/src/kudu/consensus/log_cache-test.cc
b/src/kudu/consensus/log_cache-test.cc
index fbc1c8f..2c58e4b 100644
--- a/src/kudu/consensus/log_cache-test.cc
+++ b/src/kudu/consensus/log_cache-test.cc
@@ -83,7 +83,7 @@ class LogCacheTest : public KuduTest {
virtual void SetUp() OVERRIDE {
KuduTest::SetUp();
- fs_manager_.reset(new FsManager(env_, GetTestPath("fs_root")));
+ fs_manager_.reset(new FsManager(env_,
FsManagerOpts(GetTestPath("fs_root"))));
ASSERT_OK(fs_manager_->CreateInitialFileSystemLayout());
ASSERT_OK(fs_manager_->Open());
CHECK_OK(log::Log::Open(log::LogOptions(),
diff --git a/src/kudu/fs/fs_manager.cc b/src/kudu/fs/fs_manager.cc
index 8c53010..62d7ab1 100644
--- a/src/kudu/fs/fs_manager.cc
+++ b/src/kudu/fs/fs_manager.cc
@@ -151,19 +151,13 @@ FsManagerOpts::FsManagerOpts(const string& root)
read_only(false),
update_instances(UpdateInstanceBehavior::UPDATE_AND_IGNORE_FAILURES) {}
-FsManager::FsManager(Env* env, const string& root_path)
- : env_(DCHECK_NOTNULL(env)),
- opts_(FsManagerOpts(root_path)),
- error_manager_(new FsErrorManager()),
- initted_(false) {}
-
FsManager::FsManager(Env* env, FsManagerOpts opts)
: env_(DCHECK_NOTNULL(env)),
opts_(std::move(opts)),
error_manager_(new FsErrorManager()),
initted_(false) {
-DCHECK(opts_.update_instances == UpdateInstanceBehavior::DONT_UPDATE ||
- !opts_.read_only) << "FsManager can only be for updated if not in
read-only mode";
+ DCHECK(opts_.update_instances == UpdateInstanceBehavior::DONT_UPDATE ||
+ !opts_.read_only) << "FsManager can only be for updated if not in
read-only mode";
}
FsManager::~FsManager() {}
diff --git a/src/kudu/fs/fs_manager.h b/src/kudu/fs/fs_manager.h
index 7406be0..796c145 100644
--- a/src/kudu/fs/fs_manager.h
+++ b/src/kudu/fs/fs_manager.h
@@ -72,6 +72,7 @@ namespace tserver {
class MiniTabletServerTest_TestFsLayoutEndToEnd_Test;
} // namespace tserver
+// Options that control the behavior of FsManager.
struct FsManagerOpts {
// Creates a new FsManagerOpts with default values.
FsManagerOpts();
@@ -139,9 +140,6 @@ class FsManager {
static const char *kWalFileNamePrefix;
static const char *kWalsRecoveryDirSuffix;
- // Only for unit tests.
- FsManager(Env* env, const std::string& root_path);
-
FsManager(Env* env, FsManagerOpts opts);
~FsManager();
diff --git a/src/kudu/tablet/compaction-test.cc
b/src/kudu/tablet/compaction-test.cc
index 82765f2..65144e8 100644
--- a/src/kudu/tablet/compaction-test.cc
+++ b/src/kudu/tablet/compaction-test.cc
@@ -442,7 +442,7 @@ class TestCompaction : public KuduRowSetTest {
}
} else {
string tablet_id = "KuduCompactionBenchTablet";
- FsManager fs_manager(env_, FLAGS_merge_benchmark_input_dir);
+ FsManager fs_manager(env_,
FsManagerOpts(FLAGS_merge_benchmark_input_dir));
scoped_refptr<TabletMetadata> input_meta;
ASSERT_OK(TabletMetadata::Load(&fs_manager, tablet_id, &input_meta));
diff --git a/src/kudu/tablet/delta_compaction-test.cc
b/src/kudu/tablet/delta_compaction-test.cc
index 165526c..2d7fa51 100644
--- a/src/kudu/tablet/delta_compaction-test.cc
+++ b/src/kudu/tablet/delta_compaction-test.cc
@@ -20,6 +20,7 @@
#include <cstdint>
#include <memory>
#include <string>
+#include <utility>
#include <vector>
#include <gflags/gflags.h>
@@ -99,7 +100,7 @@ class TestDeltaCompaction : public KuduTest {
virtual void SetUp() OVERRIDE {
KuduTest::SetUp();
SeedRandom();
- fs_manager_.reset(new FsManager(env_, GetTestPath("fs_root")));
+ fs_manager_.reset(new FsManager(env_,
FsManagerOpts(GetTestPath("fs_root"))));
ASSERT_OK(fs_manager_->CreateInitialFileSystemLayout());
ASSERT_OK(fs_manager_->Open());
}
diff --git a/src/kudu/tablet/deltafile-test.cc
b/src/kudu/tablet/deltafile-test.cc
index 02a72dc..207b46c 100644
--- a/src/kudu/tablet/deltafile-test.cc
+++ b/src/kudu/tablet/deltafile-test.cc
@@ -27,7 +27,6 @@
#include <vector>
#include <gflags/gflags.h>
-#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include <gtest/gtest.h>
@@ -90,7 +89,7 @@ class TestDeltaFile : public KuduTest {
public:
void SetUp() OVERRIDE {
- fs_manager_.reset(new FsManager(env_, GetTestPath("fs")));
+ fs_manager_.reset(new FsManager(env_, FsManagerOpts(GetTestPath("fs"))));
ASSERT_OK(fs_manager_->CreateInitialFileSystemLayout());
ASSERT_OK(fs_manager_->Open());
}
diff --git a/src/kudu/tablet/deltamemstore-test.cc
b/src/kudu/tablet/deltamemstore-test.cc
index fce37c0..09abc9a 100644
--- a/src/kudu/tablet/deltamemstore-test.cc
+++ b/src/kudu/tablet/deltamemstore-test.cc
@@ -206,7 +206,7 @@ TEST_F(TestDeltaMemStore, TestUpdateCount) {
// Flush the delta file so that the stats get updated.
- FsManager fs(env_, GetTestPath("fs_root"));
+ FsManager fs(env_, FsManagerOpts(GetTestPath("fs_root")));
ASSERT_OK(fs.CreateInitialFileSystemLayout());
ASSERT_OK(fs.Open());
unique_ptr<WritableBlock> block;
diff --git a/src/kudu/tablet/tablet-harness.h b/src/kudu/tablet/tablet-harness.h
index f714d46..2a60cdd 100644
--- a/src/kudu/tablet/tablet-harness.h
+++ b/src/kudu/tablet/tablet-harness.h
@@ -84,7 +84,7 @@ class TabletHarness {
std::pair<PartitionSchema, Partition>
partition(CreateDefaultPartition(schema_));
// Build the Tablet
- fs_manager_.reset(new FsManager(options_.env, options_.root_dir));
+ fs_manager_.reset(new FsManager(options_.env,
FsManagerOpts(options_.root_dir)));
if (first_time) {
RETURN_NOT_OK(fs_manager_->CreateInitialFileSystemLayout());
}
diff --git a/src/kudu/tools/kudu-tool-test.cc b/src/kudu/tools/kudu-tool-test.cc
index 16bd409..e478413 100644
--- a/src/kudu/tools/kudu-tool-test.cc
+++ b/src/kudu/tools/kudu-tool-test.cc
@@ -1244,7 +1244,7 @@ TEST_F(ToolTest, TestFsCheck) {
// the other half are deemed missing.
vector<BlockId> missing_ids;
{
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
FsReport report;
ASSERT_OK(fs.Open(&report));
std::shared_ptr<BlockDeletionTransaction> deletion_transaction =
@@ -1266,7 +1266,7 @@ TEST_F(ToolTest, TestFsCheck) {
// Here we check twice to show that if --repair isn't provided, there should
// be no effect.
{
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
FsReport report;
ASSERT_OK(fs.Open(&report));
ASSERT_OK(env_->DeleteFile(fs.GetTabletMetadataPath(kTabletId)));
@@ -1304,7 +1304,7 @@ TEST_F(ToolTest, TestFsCheckLiveServer) {
TEST_F(ToolTest, TestFsFormat) {
const string kTestDir = GetTestPath("test");
NO_FATALS(RunActionStdoutNone(Substitute("fs format --fs_wal_dir=$0",
kTestDir)));
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.Open());
ObjectIdGenerator generator;
@@ -1319,7 +1319,7 @@ TEST_F(ToolTest, TestFsFormatWithUuid) {
string original_uuid = generator.Next();
NO_FATALS(RunActionStdoutNone(Substitute(
"fs format --fs_wal_dir=$0 --uuid=$1", kTestDir, original_uuid)));
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.Open());
string canonicalized_uuid;
@@ -1332,7 +1332,7 @@ TEST_F(ToolTest, TestFsDumpUuid) {
const string kTestDir = GetTestPath("test");
string uuid;
{
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.CreateInitialFileSystemLayout());
ASSERT_OK(fs.Open());
uuid = fs.uuid();
@@ -1350,7 +1350,7 @@ TEST_F(ToolTest, TestPbcTools) {
string instance_path;
{
ObjectIdGenerator generator;
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.CreateInitialFileSystemLayout(generator.Next()));
ASSERT_OK(fs.Open());
uuid = fs.uuid();
@@ -1501,7 +1501,7 @@ TEST_F(ToolTest, TestPbcTools) {
TEST_F(ToolTest, TestFsDumpCFile) {
const int kNumEntries = 8192;
const string kTestDir = GetTestPath("test");
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.CreateInitialFileSystemLayout());
ASSERT_OK(fs.Open());
@@ -1553,7 +1553,7 @@ TEST_F(ToolTest, TestFsDumpCFile) {
TEST_F(ToolTest, TestFsDumpBlock) {
const string kTestDir = GetTestPath("test");
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.CreateInitialFileSystemLayout());
ASSERT_OK(fs.Open());
@@ -1578,7 +1578,7 @@ TEST_F(ToolTest, TestWalDump) {
const Schema kSchema(GetSimpleTestSchema());
const Schema kSchemaWithIds(SchemaBuilder(kSchema).Build());
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.CreateInitialFileSystemLayout());
ASSERT_OK(fs.Open());
@@ -1740,7 +1740,7 @@ TEST_F(ToolTest, TestLocalReplicaDumpMeta) {
const Schema kSchema(GetSimpleTestSchema());
const Schema kSchemaWithIds(SchemaBuilder(kSchema).Build());
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.CreateInitialFileSystemLayout());
ASSERT_OK(fs.Open());
@@ -1790,7 +1790,7 @@ TEST_F(ToolTest, TestFsDumpTree) {
const Schema kSchema(GetSimpleTestSchema());
const Schema kSchemaWithIds(SchemaBuilder(kSchema).Build());
- FsManager fs(env_, kTestDir);
+ FsManager fs(env_, FsManagerOpts(kTestDir));
ASSERT_OK(fs.CreateInitialFileSystemLayout());
ASSERT_OK(fs.Open());
