[kudu] branch master updated: start_kudu.sh script changes

[ab...@apache.org]

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

abukor 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 150f3ee  start_kudu.sh script changes
150f3ee is described below

commit 150f3ee1a4c7a19ec46797928dc8b84e14b6c4a8
Author: Zoltan Chovan <zc...@cloudera.com>
AuthorDate: Tue Nov 23 17:47:18 2021 +0100

    start_kudu.sh script changes
    
    - removed the readlink -f line as it wasn't providing any value
    - added check for detecting if $KUDU_HOME is set or $KUDU_HOME/www is
    available
    - WEBSERVER_DOC_ROOT was made optional, doesn't stop the startup if not
      found
    - webserver_doc_root flag is not set on master/tserver if not found
    - added warning to clarify the usage of -b|--builddir flag
    
    Change-Id: I0057a6d6668488001be8b4f74f46010e2620b46e
    Reviewed-on: http://gerrit.cloudera.org:8080/18049
    Tested-by: Kudu Jenkins
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
    Reviewed-by: Attila Bukor <ab...@apache.org>
---
 src/kudu/scripts/start_kudu.sh | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/kudu/scripts/start_kudu.sh b/src/kudu/scripts/start_kudu.sh
index 575877c..db33d4e 100755
--- a/src/kudu/scripts/start_kudu.sh
+++ b/src/kudu/scripts/start_kudu.sh
@@ -51,11 +51,11 @@ NUM_TSERVERS=3
 MASTER_RPC_PORT_BASE=8764
 TSERVER_RPC_PORT_BASE=9870
 TIME_SOURCE=system_unsync
-BUILDDIR="$PWD"
+BUILDDIR=""
 CLUSTER_DIR="$PWD"
 EXTRA_TSERVER_FLAGS=""
 EXTRA_MASTER_FLAGS=""
-echo $(readlink -f $(dirname $0))
+
 while (( "$#" )); do
   case "$1" in
     -h|--help)
@@ -115,14 +115,30 @@ while (( "$#" )); do
   esac
 done
 
-WEBSERVER_DOC_ROOT="$BUILDDIR/../../www"
+if [ -z "$BUILDDIR" ]; then
+  echo -n "Assuming that the script was started from the build directory. "
+  echo "You can override this with -b|--builddir option."
+  BUILDDIR="$PWD"
+fi
+
+# If $KUDU_HOME is not set or $KUDU_HOME/www doesn't exists, let's default to $BUILDDIR/../../www
+# In case neither is available we'll issue a warning and won't set the --webserver_doc_root flag
+# for kudu-master and kudu-tserver
+if [ -z "$KUDU_HOME" ] || [ ! -d "$KUDU_HOME/www" ]; then
+  WEBSERVER_DOC_ROOT="$BUILDDIR/../../www"
+fi
+
+if [ ! -d "$WEBSERVER_DOC_ROOT" ]; then
+  echo  -n "Cannot find webroot directory $WEBSERVER_DOC_ROOT at "
+  echo "\$KUDU_HOME/www or \$BUILDDIR/../../www"
+fi
+
 KUDUMASTER="$BUILDDIR/bin/kudu-master"
 KUDUTSERVER="$BUILDDIR/bin/kudu-tserver"
 echo $KUDUMASTER
 echo $KUDUTSERVER
 IP=127.0.0.1
 
-[ ! -d "$WEBSERVER_DOC_ROOT" ] && { echo "Cannot find webroot directory $WEBSERVER_DOC_ROOT"; exit 1; }
 [ ! -x "$KUDUMASTER" ] && { echo "Cannot find $KUDUMASTER executable";  exit 1; }
 [ ! -x "$KUDUTSERVER" ] && { echo "Cannot find $KUDUTSERVER executable";  exit 1; }
 
@@ -167,7 +183,7 @@ function start_master() {
   ARGS="$ARGS --unlock_unsafe_flags"
   ARGS="$ARGS --webserver_port=$HTTP_PORT"
   ARGS="$ARGS --webserver_interface=$IP"
-  ARGS="$ARGS --webserver_doc_root=$WEBSERVER_DOC_ROOT"
+  if [ -d "$WEBSERVER_DOC_ROOT" ]; then ARGS="$ARGS --webserver_doc_root=$WEBSERVER_DOC_ROOT"; fi
   ARGS="$ARGS $EXTRA_MASTER_FLAGS"
   $ARGS &
   pids+=($!)
@@ -187,7 +203,7 @@ function start_tserver() {
   ARGS="$ARGS --unlock_unsafe_flags"
   ARGS="$ARGS --webserver_port=$HTTP_PORT"
   ARGS="$ARGS --webserver_interface=$IP"
-  ARGS="$ARGS --webserver_doc_root=$WEBSERVER_DOC_ROOT"
+  if [ -d "$WEBSERVER_DOC_ROOT" ]; then ARGS="$ARGS --webserver_doc_root=$WEBSERVER_DOC_ROOT"; fi
   ARGS="$ARGS --tserver_master_addrs=$4"
   ARGS="$ARGS $EXTRA_TSERVER_FLAGS"
   $ARGS &