fixed #114

bin/start-waterdrop.sh

@@ -52,7 +52,7 @@ LIB_DIR=${APP_DIR}/lib
 PLUGINS_DIR=${APP_DIR}/plugins
 
 DEFAULT_CONFIG=${CONF_DIR}/application.conf
-CONFIG_FILE=${CONFIG_FILE:-DEFAULT_CONFIG}
+CONFIG_FILE=${CONFIG_FILE:-$DEFAULT_CONFIG}
 
 DEFAULT_MASTER=local[2]
 MASTER=${MASTER:-$DEFAULT_MASTER}
@@ -62,6 +62,7 @@ DEPLOY_MODE=${DEPLOY_MODE:-$DEFAULT_DEPLOY_MODE}
 
 # scan jar dependencies for all plugins
 source ${UTILS_DIR}/file.sh
+source ${UTILS_DIR}/app.sh
 jarDependencies=$(listJarDependenciesOfPlugins ${PLUGINS_DIR})
 JarDepOpts=""
 if [ "$jarDependencies" != "" ]; then
@@ -89,6 +90,7 @@ assemblyJarName=$(find ${LIB_DIR} -name Waterdrop-*.jar)
 source ${CONF_DIR}/waterdrop-env.sh
 
 exec ${SPARK_HOME}/bin/spark-submit --class io.github.interestinglab.waterdrop.Waterdrop \
+    --name $(getAppName ${CONFIG_FILE}) \
     --master ${MASTER} \
     --deploy-mode ${DEPLOY_MODE} \
     ${JarDepOpts} \

bin/utils/app.sh

@@ -0,0 +1,32 @@
+# Get App Name of Waterdrop
+function getAppName {
+
+    if [ "$#" -ne 1 ]; then
+        echo "Illegal number of parameters"
+        exit -1
+    fi
+
+    config_file_path=$1
+
+    app_name_config=$(grep -i "spark.app.name" ${config_file_path})
+    # remove all leading and trailing  whitespace
+    app_name_config=$(echo ${app_name_config} | tr -d '[:space:]')
+
+    DEFAULT_APP_NAME="Waterdrop"
+    APP_NAME=${DEFAULT_APP_NAME}
+
+    if [[ ${app_name_config} == \#* ]]; then
+        # spark.app.name is commented, we should ignore
+        :
+    else
+
+        if [ "${app_name_config}" != "" ];then
+            # split app_name from config
+            APP_NAME=${app_name_config##*=}
+            # remove quotes if exists
+            APP_NAME=$(echo ${APP_NAME} | tr -d '"' | tr -d "'")
+        fi
+    fi
+
+    echo ${APP_NAME}
+}