HDFS-11046. Duplicate '-' in the daemon log name.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dc3272bf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dc3272bf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dc3272bf Branch: refs/heads/YARN-4752 Commit: dc3272bfe8ceebe2f56bd6ab3be7bdca6185dc00 Parents: 9d17585 Author: Akira Ajisaka <aajis...@apache.org> Authored: Tue Oct 25 10:06:29 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Tue Oct 25 10:07:43 2016 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/src/main/bin/hadoop | 2 +- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc3272bf/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 450543d..bc28c67 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop @@ -230,7 +230,7 @@ fi if [[ "${HADOOP_DAEMON_MODE}" != "default" ]]; then # shellcheck disable=SC2034 HADOOP_ROOT_LOGGER="${HADOOP_DAEMON_ROOT_LOGGER}" - if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then + if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then # shellcheck disable=SC2034 HADOOP_LOGFILE="hadoop-${HADOOP_SECURE_USER}-${HADOOP_IDENT_STRING}-${HADOOP_SUBCMD}-${HOSTNAME}.log" else http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc3272bf/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 6d6088f..2299980 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs @@ -286,7 +286,7 @@ fi if [[ "${HADOOP_DAEMON_MODE}" != "default" ]]; then # shellcheck disable=SC2034 HADOOP_ROOT_LOGGER="${HADOOP_DAEMON_ROOT_LOGGER}" - if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then + if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then # shellcheck disable=SC2034 HADOOP_LOGFILE="hadoop-${HADOOP_SECURE_USER}-${HADOOP_IDENT_STRING}-${HADOOP_SUBCMD}-${HOSTNAME}.log" else --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org