[kudu] branch master updated: [script][test] Supply --master_addresses for single master config

[ba...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bankim 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 de65aa6  [script][test] Supply --master_addresses for single master config
de65aa6 is described below

commit de65aa60b6ec8bec705b9226bc7a713296d6117e
Author: Bankim Bhavsar <ba...@cloudera.com>
AuthorDate: Fri Apr 23 14:51:11 2021 -0700

    [script][test] Supply --master_addresses for single master config
    
    Supplying --master_addresses to single master configuration
    helps populate the 'last_known_addr' field in single master
    Raft configuration which is a pre-requisite for migrating
    to multi-master configuration.
    
    Change a59d382 previously added support to supply
    --master_addresses for single master configuration.
    https://git.io/JOD25
    
    This change:
    - Updates scripts to start supplying --master_addresses by default
    even for single master configurations. Fixes some port numbers
    in a development documentation that uses the script.
    - Updates the default in ExternalMiniCluster to start supplying
    --master_addresses for single master configuration.
    
    Change-Id: I38d091b3acc607d5faf9aeb075069482af75723a
    Reviewed-on: http://gerrit.cloudera.org:8080/17335
    Tested-by: Kudu Jenkins
    Reviewed-by: Andrew Wong <aw...@cloudera.com>
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
 docker/kudu-entrypoint.sh                      | 1 +
 docs/quickstartdev.adoc                        | 6 +++---
 src/kudu/mini-cluster/external_mini_cluster.cc | 2 +-
 src/kudu/mini-cluster/external_mini_cluster.h  | 2 +-
 src/kudu/scripts/start_kudu.sh                 | 4 +---
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docker/kudu-entrypoint.sh b/docker/kudu-entrypoint.sh
index 8202143..814bf0d 100755
--- a/docker/kudu-entrypoint.sh
+++ b/docker/kudu-entrypoint.sh
@@ -96,6 +96,7 @@ fi
 if [[ "$1" == "master" ]]; then
   mkdir -p "$SERVICE_DIR"
   wait_for_master_hosts
+  # Supply --master_addresses even if a single master address is specified.
   if [[ -n "$KUDU_MASTERS" ]]; then
     MASTER_ARGS="--master_addresses=$KUDU_MASTERS $MASTER_ARGS"
   fi
diff --git a/docs/quickstartdev.adoc b/docs/quickstartdev.adoc
index d9e556e..acb796e 100644
--- a/docs/quickstartdev.adoc
+++ b/docs/quickstartdev.adoc
@@ -31,20 +31,20 @@ cd build/latest
 
 == Check Kudu master server web interface
 
-Open in browser: http://localhost:8764/
+Open in browser: http://localhost:8765/
 
 == Generate and load some data into Kudu
 
 [source,bash]
 ----
-./bin/kudu perf loadgen 127.0.0.1:8765 --keep_auto_table=true --num_rows_per_thread=100000 --run_scan=true
+./bin/kudu perf loadgen 127.0.0.1:8764 --keep_auto_table=true --num_rows_per_thread=100000 --run_scan=true
 ----
 
 == Query Kudu servers
 
 [source,bash]
 ----
-./bin/kudu master get_flags 127.0.0.1:8765
+./bin/kudu master get_flags 127.0.0.1:8764
 ./bin/kudu tserver get_flags 127.0.0.1:9870
 ----
 
diff --git a/src/kudu/mini-cluster/external_mini_cluster.cc b/src/kudu/mini-cluster/external_mini_cluster.cc
index 74e56a5..0fec6b8 100644
--- a/src/kudu/mini-cluster/external_mini_cluster.cc
+++ b/src/kudu/mini-cluster/external_mini_cluster.cc
@@ -114,7 +114,7 @@ static double kMasterCatalogManagerTimeoutSeconds = 60.0;
 
 ExternalMiniClusterOptions::ExternalMiniClusterOptions()
     : num_masters(1),
-      supply_single_master_addr(false),
+      supply_single_master_addr(true),
       num_tablet_servers(1),
       bind_mode(kDefaultBindMode),
       num_data_dirs(1),
diff --git a/src/kudu/mini-cluster/external_mini_cluster.h b/src/kudu/mini-cluster/external_mini_cluster.h
index f4bd5fc..d1cc42a 100644
--- a/src/kudu/mini-cluster/external_mini_cluster.h
+++ b/src/kudu/mini-cluster/external_mini_cluster.h
@@ -137,7 +137,7 @@ struct ExternalMiniClusterOptions {
   int num_masters;
 
   // Whether to supply 'master_addresses' field for single master configuration.
-  // Default: False
+  // Default: True
   bool supply_single_master_addr;
 
   // Number of TS to start.
diff --git a/src/kudu/scripts/start_kudu.sh b/src/kudu/scripts/start_kudu.sh
index baf733c..575877c 100755
--- a/src/kudu/scripts/start_kudu.sh
+++ b/src/kudu/scripts/start_kudu.sh
@@ -158,9 +158,7 @@ function start_master() {
   create_dirs_and_set_vars $1
   set_port_vars_and_print $1 $2 $3
   ARGS="$KUDUMASTER"
-  if [ $NUM_MASTERS -gt 1 ]; then
-    ARGS="$ARGS --master_addresses=$MASTER_ADDRESSES"
-  fi
+  ARGS="$ARGS --master_addresses=$MASTER_ADDRESSES"
   ARGS="$ARGS --fs_data_dirs=$dir_data"
   ARGS="$ARGS --fs_wal_dir=$dir_wal"
   ARGS="$ARGS --log_dir=$dir_log"