Kaynağa Gözat

HADOOP-13120. add a --debug message when dynamic commands have been used

Allen Wittenauer 9 yıl önce
ebeveyn
işleme
41c7cb911a

+ 1 - 0
hadoop-common-project/hadoop-common/src/main/bin/hadoop

@@ -197,6 +197,7 @@ shift
 HADOOP_SUBCMD_ARGS=("$@")
 
 if declare -f hadoop_subcommand_"${HADOOP_SUBCMD}" >/dev/null 2>&1; then
+  hadoop_debug "Calling dynamically: hadoop_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[$*]}"
   "hadoop_subcommand_${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
 else
   hadoopcmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"

+ 3 - 3
hadoop-common-project/hadoop-common/src/test/scripts/hadoop_subcommands.bats

@@ -21,8 +21,9 @@ load hadoop-functions_test_helper
 subcommandsetup () {
   export HADOOP_LIBEXEC_DIR="${TMP}/libexec"
   export HADOOP_CONF_DIR="${TMP}/conf"
-  mkdir -p "${HADOOP_LIBEXEC_DIR}/shellprofile.d" "${HADOOP_CONF_DIR}/shellprofile.d"
-  cat <<-'TOKEN'   > "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
+  mkdir -p "${HADOOP_LIBEXEC_DIR}"
+  echo   ". \"${BATS_TEST_DIRNAME}/../../main/bin/hadoop-functions.sh\"" > "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
+  cat <<-'TOKEN'   >> "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
 
 hadoop_subcommand_sub () {
   echo "unittest"
@@ -42,7 +43,6 @@ hadoop_subcommand_envcheck ()
 }
 TOKEN
   chmod a+rx "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
-
 }
 
 @test "hadoop_subcommand (addition)" {

+ 1 - 0
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs

@@ -279,6 +279,7 @@ shift
 HADOOP_SUBCMD_ARGS=("$@")
 
 if declare -f hdfs_subcommand_"${HADOOP_SUBCMD}" >/dev/null 2>&1; then
+  hadoop_debug "Calling dynamically: hdfs_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[$*]}"
   "hdfs_subcommand_${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
 else
   hdfscmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"

+ 3 - 3
hadoop-hdfs-project/hadoop-hdfs/src/test/scripts/hdfs_subcommands.bats

@@ -21,8 +21,9 @@ load hdfs-functions_test_helper
 subcommandsetup () {
   export HADOOP_LIBEXEC_DIR="${TMP}/libexec"
   export HADOOP_CONF_DIR="${TMP}/conf"
-  mkdir -p "${HADOOP_LIBEXEC_DIR}/shellprofile.d" "${HADOOP_CONF_DIR}/shellprofile.d"
-  cat <<-'TOKEN'   > "${HADOOP_LIBEXEC_DIR}/hdfs-config.sh"
+  mkdir -p "${HADOOP_LIBEXEC_DIR}"
+  echo   ". \"${BATS_TEST_DIRNAME}/../../../../../hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh\"" > "${HADOOP_LIBEXEC_DIR}/hdfs-config.sh"
+  cat <<-'TOKEN'   >> "${HADOOP_LIBEXEC_DIR}/hdfs-config.sh"
 
 hdfs_subcommand_sub () {
   echo "unittest"
@@ -42,7 +43,6 @@ hdfs_subcommand_envcheck ()
 }
 TOKEN
   chmod a+rx "${HADOOP_LIBEXEC_DIR}/hdfs-config.sh"
-
 }
 
 @test "hdfs_subcommand (addition)" {

+ 1 - 0
hadoop-mapreduce-project/bin/mapred

@@ -144,6 +144,7 @@ shift
 HADOOP_SUBCMD_ARGS=("$@")
 
 if declare -f mapred_subcommand_"${HADOOP_SUBCMD}" >/dev/null 2>&1; then
+  hadoop_debug "Calling dynamically: mapred_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[$*]}"
   "mapred_subcommand_${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
 else
   mapredcmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"

+ 1 - 0
hadoop-yarn-project/hadoop-yarn/bin/yarn

@@ -256,6 +256,7 @@ shift
 HADOOP_SUBCMD_ARGS=("$@")
 
 if declare -f yarn_subcommand_"${HADOOP_SUBCMD}" >/dev/null 2>&1; then
+  hadoop_debug "Calling dynamically: yarn_subcommand_${HADOOP_SUBCMD} ${HADOOP_SUBCMD_ARGS[$*]}"
   "yarn_subcommand_${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
 else
   yarncmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"