issue=baidu#1271 Add mock zk adapter for test

yvxiang · Jun 9, 2017 · 8d93699 · 8d93699
1 parent 4e62477
commit 8d93699
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/master/master_impl.cc b/src/master/master_impl.cc
@@ -168,11 +168,12 @@ MasterImpl::~MasterImpl() {
 bool MasterImpl::Init() {
     if (FLAGS_tera_zk_enabled) {
         zk_adapter_.reset(new MasterZkAdapter(this, local_addr_));
-    } else if (FLAGS_tera_mock_zk_enabled) {
-        zk_adapter_.reset(new MockMasterZkAdapter(this, local_addr_));
     } else if (FLAGS_tera_ins_enabled) {
         LOG(INFO) << "ins mode" ;
         zk_adapter_.reset(new InsMasterZkAdapter(this, local_addr_));
+    } else if (FLAGS_tera_mock_zk_enabled) {
+        LOG(INFO) << "mock zk mode" ;
+        zk_adapter_.reset(new MockMasterZkAdapter(this, local_addr_));
     } else if (FLAGS_tera_mock_ins_enabled) {
         LOG(INFO) << "mock ins mode" ;
         zk_adapter_.reset(new MockInsMasterZkAdapter(this, local_addr_));

diff --git a/src/sdk/sdk_zk.cc b/src/sdk/sdk_zk.cc
@@ -123,14 +123,14 @@ bool FakeZkClusterFinder::ReadNode(const std::string& name, std::string* value)
 }
 
 ClusterFinder* NewClusterFinder() {
-    if (FLAGS_tera_ins_enabled) {
+    if (FLAGS_tera_zk_enabled) {
+        return new sdk::FakeZkClusterFinder(FLAGS_tera_fake_zk_path_prefix);
+    } else if (FLAGS_tera_ins_enabled) {
         return new sdk::InsClusterFinder(FLAGS_tera_ins_root_path, FLAGS_tera_ins_addr_list);
-    } else if (FLAGS_tera_mock_ins_enabled) {
-        return new sdk::MockInsClusterFinder(FLAGS_tera_ins_root_path, FLAGS_tera_ins_addr_list);
     } else if (FLAGS_tera_mock_zk_enabled) {
         return new sdk::MockZkClusterFinder(FLAGS_tera_zk_root_path, FLAGS_tera_zk_addr_list);
-    } else if (!FLAGS_tera_zk_enabled) {
-        return new sdk::FakeZkClusterFinder(FLAGS_tera_fake_zk_path_prefix);
+    } else if (FLAGS_tera_mock_ins_enabled) {
+        return new sdk::MockInsClusterFinder(FLAGS_tera_ins_root_path, FLAGS_tera_ins_addr_list);
     } else {
         return new sdk::ZkClusterFinder(FLAGS_tera_zk_root_path, FLAGS_tera_zk_addr_list);
     }

diff --git a/src/tabletnode/tabletnode_impl.cc b/src/tabletnode/tabletnode_impl.cc
@@ -159,11 +159,12 @@ TabletNodeImpl::~TabletNodeImpl() {
 bool TabletNodeImpl::Init() {
     if (FLAGS_tera_zk_enabled) {
         zk_adapter_.reset(new TabletNodeZkAdapter(this, local_addr_));
-    } else if (FLAGS_tera_mock_zk_enabled) {
-        zk_adapter_.reset(new MockTabletNodeZkAdapter(this, local_addr_));
     } else if(FLAGS_tera_ins_enabled) {
         LOG(INFO) << "ins mode!";
         zk_adapter_.reset(new InsTabletNodeZkAdapter(this, local_addr_));
+    } else if (FLAGS_tera_mock_zk_enabled) {
+        LOG(INFO) << "mock zk mode!";
+        zk_adapter_.reset(new MockTabletNodeZkAdapter(this, local_addr_));
     } else if (FLAGS_tera_mock_ins_enabled) {
         LOG(INFO) << "mock ins mode!";
         zk_adapter_.reset(new MockInsTabletNodeZkAdapter(this, local_addr_));