HADOOP-13120. add a --debug message when dynamic commands have been used
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/41c7cb91 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/41c7cb91 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/41c7cb91 Branch: refs/heads/HADOOP-12930 Commit: 41c7cb911a28ded39d582edac41fba15b9c08c70 Parents: 7bb7bb8 Author: Allen Wittenauer <a...@apache.org> Authored: Sun May 8 11:54:12 2016 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Sun May 15 07:50:15 2016 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/src/main/bin/hadoop | 1 + .../hadoop-common/src/test/scripts/hadoop_subcommands.bats | 6 +++--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 1 + .../hadoop-hdfs/src/test/scripts/hdfs_subcommands.bats | 6 +++--- hadoop-mapreduce-project/bin/mapred | 1 + hadoop-yarn-project/hadoop-yarn/bin/yarn | 1 + 6 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c7cb91/hadoop-common-project/hadoop-common/src/main/bin/hadoop ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop b/hadoop-common-project/hadoop-common/src/main/bin/hadoop index 61fdc2e..0f6982b 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/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[@]}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c7cb91/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_subcommands.bats ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_subcommands.bats b/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_subcommands.bats index eda2e3d..c3832ca 100755 --- a/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_subcommands.bats +++ b/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)" { http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c7cb91/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs index 19a81d5..a2bf057 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs +++ b/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[@]}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c7cb91/hadoop-hdfs-project/hadoop-hdfs/src/test/scripts/hdfs_subcommands.bats ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/scripts/hdfs_subcommands.bats b/hadoop-hdfs-project/hadoop-hdfs/src/test/scripts/hdfs_subcommands.bats index 33fb9aa..d4ea000 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/scripts/hdfs_subcommands.bats +++ b/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)" { http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c7cb91/hadoop-mapreduce-project/bin/mapred ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred index c929d98..0df093c 100755 --- a/hadoop-mapreduce-project/bin/mapred +++ b/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[@]}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/41c7cb91/hadoop-yarn-project/hadoop-yarn/bin/yarn ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index bb8b17a..45b3fb9 100755 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/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[@]}" --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
