kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [2/2] kudu git commit: external_mini_cluster: adjust single master data directory
Date Tue, 02 Aug 2016 20:39:54 GMT
external_mini_cluster: adjust single master data directory

If we stored single master data in "master-0" and not "master", it'd be
possible to reuse single master cluster data in a multi master cluster. This
should be a purely cosmetic change, but I've put it in its own patch to draw
more attention to it in case I'm wrong.

I snuck in a change to remove --enable_leader_failure_detection=true as
that's now the default value.

Change-Id: Ia1cfcd529b14cb2472a8673edbc28dbe66175a8a
Reviewed-on: http://gerrit.cloudera.org:8080/3810
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/9650ac7f
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/9650ac7f
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/9650ac7f

Branch: refs/heads/master
Commit: 9650ac7fa040379c0b81d61ad3ee063f2e2d795d
Parents: a9265d9
Author: Adar Dembo <adar@cloudera.com>
Authored: Wed Jul 27 22:06:00 2016 -0700
Committer: Adar Dembo <adar@cloudera.com>
Committed: Tue Aug 2 20:37:19 2016 +0000

----------------------------------------------------------------------
 src/kudu/integration-tests/external_mini_cluster.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/9650ac7f/src/kudu/integration-tests/external_mini_cluster.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/external_mini_cluster.cc b/src/kudu/integration-tests/external_mini_cluster.cc
index 62daef2..a7300df 100644
--- a/src/kudu/integration-tests/external_mini_cluster.cc
+++ b/src/kudu/integration-tests/external_mini_cluster.cc
@@ -214,7 +214,7 @@ vector<string> SubstituteInFlags(const vector<string>&
orig_flags,
 Status ExternalMiniCluster::StartSingleMaster() {
   string exe = GetBinaryPath(kMasterBinaryName);
   scoped_refptr<ExternalMaster> master =
-    new ExternalMaster(messenger_, exe, GetDataPath("master"),
+    new ExternalMaster(messenger_, exe, GetDataPath("master-0"),
                        SubstituteInFlags(opts_.extra_master_flags, 0));
   RETURN_NOT_OK(master->Start());
   masters_.push_back(master);
@@ -234,10 +234,8 @@ Status ExternalMiniCluster::StartDistributedMasters() {
     string addr = Substitute("127.0.0.1:$0", opts_.master_rpc_ports[i]);
     peer_addrs.push_back(addr);
   }
-  string peer_addrs_str = JoinStrings(peer_addrs, ",");
   vector<string> flags = opts_.extra_master_flags;
-  flags.push_back("--master_addresses=" + peer_addrs_str);
-  flags.push_back("--enable_leader_failure_detection=true");
+  flags.push_back("--master_addresses=" + JoinStrings(peer_addrs, ","));
   string exe = GetBinaryPath(kMasterBinaryName);
 
   // Start the masters.


Mime
View raw message