瀏覽代碼

YARN-7318. Fix shell check warnings of SLS. (Gergely Novák via wangda)

(cherry picked from commit 281d83604df8341c210cee39bdc745ca793c5afa)
Wangda Tan 7 年之前
父節點
當前提交
881263260c
共有 2 個文件被更改,包括 6 次插入0 次删除
  1. 3 0
      hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh
  2. 3 0
      hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh

+ 3 - 0
hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh

@@ -60,6 +60,8 @@ function calculate_classpath()
 
 
 function run_sls_generator()
 function run_sls_generator()
 {
 {
+  local args
+
   if [[ -z "${outputprefix}" ]] ; then
   if [[ -z "${outputprefix}" ]] ; then
     outputprefix="sls"
     outputprefix="sls"
   fi
   fi
@@ -88,6 +90,7 @@ HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}"
 # shellcheck disable=SC2034
 # shellcheck disable=SC2034
 HADOOP_NEW_CONFIG=true
 HADOOP_NEW_CONFIG=true
 if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
 if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
+  # shellcheck disable=SC1090
   . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
   . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
 else
 else
   echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1
   echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1

+ 3 - 0
hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh

@@ -81,6 +81,8 @@ function calculate_classpath
 
 
 function run_simulation() {
 function run_simulation() {
 
 
+  local args
+
    if [[ "${inputsls}" != "" ]] ; then
    if [[ "${inputsls}" != "" ]] ; then
         hadoop_add_param args -inputsls "-inputsls ${inputsls}"
         hadoop_add_param args -inputsls "-inputsls ${inputsls}"
    fi
    fi
@@ -126,6 +128,7 @@ HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}"
 # shellcheck disable=SC2034
 # shellcheck disable=SC2034
 HADOOP_NEW_CONFIG=true
 HADOOP_NEW_CONFIG=true
 if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
 if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
+  # shellcheck disable=SC1090
   . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
   . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
 else
 else
   echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1
   echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1