[zeppelin] branch master updated: [ZEPPELIN-5040]. USE_HADOOP should be true by default

[zj...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4c72ede  [ZEPPELIN-5040]. USE_HADOOP should be true by default
4c72ede is described below

commit 4c72ede4ce909bddfd8968055304002b34c500a5
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Mon Sep 14 11:50:41 2020 +0800

    [ZEPPELIN-5040]. USE_HADOOP should be true by default
    
    ### What is this PR for?
    
    Trivial PR to include hadoop jars in zeppelin by default. Hadoop jars will be excluded unless user specify `USE_HADOOP` as false.
    
    ### What type of PR is it?
    [Improvement ]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-5040
    
    ### How should this be tested?
    * CI pass
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Jeff Zhang <zj...@apache.org>
    
    Closes #3907 from zjffdu/ZEPPELIN-5040 and squashes the following commits:
    
    84d046487 [Jeff Zhang] [ZEPPELIN-5040]. USE_HADOOP should be true by default
---
 bin/zeppelin-daemon.sh        | 9 ++++-----
 conf/zeppelin-env.sh.template | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/zeppelin-daemon.sh b/bin/zeppelin-daemon.sh
index 517f925..f3c31ff 100755
--- a/bin/zeppelin-daemon.sh
+++ b/bin/zeppelin-daemon.sh
@@ -84,17 +84,16 @@ addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
 
 ## Add hadoop jars when env USE_HADOOP is true
-if [[ "${USE_HADOOP}" == "true"  ]]; then
+if [[ "${USE_HADOOP}" != "false"  ]]; then
   if [[ -z "${HADOOP_CONF_DIR}" ]]; then
     echo "Please specify HADOOP_CONF_DIR if USE_HADOOP is true"
-    exit 1
   else
     ZEPPELIN_CLASSPATH+=":${HADOOP_CONF_DIR}"
     if ! [ -x "$(command -v hadoop)" ]; then
-        echo 'Error: hadoop is not in PATH when HADOOP_CONF_DIR is specified.'
-        exit 1
+      echo 'hadoop command is not in PATH when HADOOP_CONF_DIR is specified.'
+    else
+      ZEPPELIN_CLASSPATH+=":`hadoop classpath`"
     fi
-    ZEPPELIN_CLASSPATH+=":`hadoop classpath`"
   fi
 fi
 
diff --git a/conf/zeppelin-env.sh.template b/conf/zeppelin-env.sh.template
index bb24e62..f266c11 100644
--- a/conf/zeppelin-env.sh.template
+++ b/conf/zeppelin-env.sh.template
@@ -17,6 +17,7 @@
 #
 
 # export JAVA_HOME=
+# export USE_HADOOP=                            # Whether include hadoop jars into zeppelin server process. (true or false)
 # export SPARK_MASTER=                          # Spark master url. eg. spark://master_addr:7077. Leave empty if you want to use local mode.
 # export ZEPPELIN_ADDR                          # Bind address (default 127.0.0.1)
 # export ZEPPELIN_PORT                          # port number to listen (default 8080)