[impala] 01/03: IMPALA-11454: part-1: use standard binaries path to start kudu test cluster

[db...@apache.org]

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

dbecker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit f5a7e1c1f7f09fa425ef70260ee405cc0fd72bf3
Author: yx91490 <yx...@126.com>
AuthorDate: Sat Jul 23 15:19:25 2022 +0800

    IMPALA-11454: part-1: use standard binaries path to start kudu test cluster
    
    The standard apache kudu binaries (kudu-master and kudu-tserver) only
    exists in /sbin, however the toolchain packaging script will also copy
    them to /bin, leading to larger package size.
    
    This patch use /sbin/kudu-(master|tserver) to start kudu test cluster,
    then we can drop /bin/kudu-(master|tserver) in toolchain package later.
    
    Testing:
    run existing CI jobs.
    
    Change-Id: I2276ee3e1650532770b856443f1087ad5036dc7a
    Reviewed-on: http://gerrit.cloudera.org:8080/18777
    Reviewed-by: Quanlong Huang <hu...@gmail.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 testdata/cluster/node_templates/common/etc/init.d/kudu-common  | 10 +++++-----
 testdata/cluster/node_templates/common/etc/init.d/kudu-master  |  2 +-
 testdata/cluster/node_templates/common/etc/init.d/kudu-tserver |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/testdata/cluster/node_templates/common/etc/init.d/kudu-common b/testdata/cluster/node_templates/common/etc/init.d/kudu-common
index 035acf730..b9f74d595 100644
--- a/testdata/cluster/node_templates/common/etc/init.d/kudu-common
+++ b/testdata/cluster/node_templates/common/etc/init.d/kudu-common
@@ -24,16 +24,16 @@
 # problem).
 
 if [[ -n "$KUDU_BUILD_DIR" ]]; then
-  KUDU_BIN_DIR="$KUDU_BUILD_DIR/bin"
+  KUDU_SBIN_DIR="$KUDU_BUILD_DIR/sbin"
   KUDU_WWW_DIR="$KUDU_HOME/www"
 else
-  KUDU_BIN_DIR="$IMPALA_KUDU_HOME"
+  KUDU_SBIN_DIR="$IMPALA_KUDU_HOME"
   if $USE_KUDU_DEBUG_BUILD; then
-    KUDU_BIN_DIR+=/debug/bin
+    KUDU_SBIN_DIR+=/debug/sbin
   else
-    KUDU_BIN_DIR+=/release/bin
+    KUDU_SBIN_DIR+=/release/sbin
   fi
-  KUDU_WWW_DIR="$KUDU_BIN_DIR/../lib/kudu/www"
+  KUDU_WWW_DIR="$KUDU_SBIN_DIR/../lib/kudu/www"
 fi
 
 KUDU_COMMON_ARGS=("-webserver_doc_root=$KUDU_WWW_DIR")
diff --git a/testdata/cluster/node_templates/common/etc/init.d/kudu-master b/testdata/cluster/node_templates/common/etc/init.d/kudu-master
index b73366287..677322157 100755
--- a/testdata/cluster/node_templates/common/etc/init.d/kudu-master
+++ b/testdata/cluster/node_templates/common/etc/init.d/kudu-master
@@ -28,7 +28,7 @@ function start {
   if [[ -n "$IMPALA_KUDU_STARTUP_FLAGS" ]]; then
     KUDU_COMMON_ARGS+=(${IMPALA_KUDU_STARTUP_FLAGS})
   fi
-  do_start "$KUDU_BIN_DIR"/kudu-master \
+  do_start "$KUDU_SBIN_DIR"/kudu-master \
       -flagfile "$NODE_DIR"/etc/kudu/master.conf \
       "${KUDU_COMMON_ARGS[@]}"
 }
diff --git a/testdata/cluster/node_templates/common/etc/init.d/kudu-tserver b/testdata/cluster/node_templates/common/etc/init.d/kudu-tserver
index 60e49e655..7dead0226 100755
--- a/testdata/cluster/node_templates/common/etc/init.d/kudu-tserver
+++ b/testdata/cluster/node_templates/common/etc/init.d/kudu-tserver
@@ -25,7 +25,7 @@ DIR=$(dirname $0)
 . "$DIR/kudu-common"   # Sets KUDU_COMMON_ARGS
 
 function start {
-  do_start "$KUDU_BIN_DIR"/kudu-tserver \
+  do_start "$KUDU_SBIN_DIR"/kudu-tserver \
       -flagfile "$NODE_DIR"/etc/kudu/tserver.conf \
       "${KUDU_COMMON_ARGS[@]}"
 }