Repository: hadoop Updated Branches: refs/heads/trunk ecc85620e -> 415e5a157
HDFS-12375. Fail to start/stop journalnodes using start-dfs.sh/stop-dfs.sh. Contributed by Bharat Viswanadham. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/415e5a15 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/415e5a15 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/415e5a15 Branch: refs/heads/trunk Commit: 415e5a157a2c97835be02db0d155404273c7713d Parents: ecc8562 Author: Anu Engineer <[email protected]> Authored: Sat Sep 23 15:05:25 2017 -0700 Committer: Anu Engineer <[email protected]> Committed: Sat Sep 23 15:05:25 2017 -0700 ---------------------------------------------------------------------- .../hadoop-hdfs/src/main/bin/start-dfs.sh | 25 ++++++++---------- .../hadoop-hdfs/src/main/bin/stop-dfs.sh | 27 +++++++++----------- 2 files changed, 23 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/415e5a15/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh index 9b6a61d..12d5209 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh @@ -144,22 +144,19 @@ fi #--------------------------------------------------------- # quorumjournal nodes (if any) -SHARED_EDITS_DIR=$("${HADOOP_HDFS_HOME}/bin/hdfs" getconf -confKey dfs.namenode.shared.edits.dir 2>&-) +JOURNAL_NODES=$("${HADOOP_HDFS_HOME}/bin/hdfs" getconf -journalNodes 2>&-) -case "${SHARED_EDITS_DIR}" in - qjournal://*) - JOURNAL_NODES=$(echo "${SHARED_EDITS_DIR}" | sed 's,qjournal://\([^/]*\)/.*,\1,g; s/;/ /g; s/:[0-9]*//g') - echo "Starting journal nodes [${JOURNAL_NODES}]" +if [[ "{$JOURNAL_NODES-}" != $'\n' ]]; then + echo "Starting journal nodes [${JOURNAL_NODES}]" - hadoop_uservar_su hdfs journalnode "${HADOOP_HDFS_HOME}/bin/hdfs" \ - --workers \ - --config "${HADOOP_CONF_DIR}" \ - --hostnames "${JOURNAL_NODES}" \ - --daemon start \ - journalnode - (( HADOOP_JUMBO_RETCOUNTER=HADOOP_JUMBO_RETCOUNTER + $? )) - ;; -esac + hadoop_uservar_su hdfs journalnode "${HADOOP_HDFS_HOME}/bin/hdfs" \ + --workers \ + --config "${HADOOP_CONF_DIR}" \ + --hostnames "${JOURNAL_NODES}" \ + --daemon start \ + journalnode + (( HADOOP_JUMBO_RETCOUNTER=HADOOP_JUMBO_RETCOUNTER + $? )) +fi #--------------------------------------------------------- # ZK Failover controllers, if auto-HA is enabled http://git-wip-us.apache.org/repos/asf/hadoop/blob/415e5a15/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh index 5d414c8..92974de 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh @@ -100,21 +100,18 @@ fi #--------------------------------------------------------- # quorumjournal nodes (if any) -SHARED_EDITS_DIR=$("${HADOOP_HDFS_HOME}/bin/hdfs" getconf -confKey dfs.namenode.shared.edits.dir 2>&-) - -case "${SHARED_EDITS_DIR}" in - qjournal://*) - JOURNAL_NODES=$(echo "${SHARED_EDITS_DIR}" | sed 's,qjournal://\([^/]*\)/.*,\1,g; s/;/ /g; s/:[0-9]*//g') - echo "Stopping journal nodes [${JOURNAL_NODES}]" - - hadoop_uservar_su hdfs journalnode "${HADOOP_HDFS_HOME}/bin/hdfs" \ - --workers \ - --config "${HADOOP_CONF_DIR}" \ - --hostnames "${JOURNAL_NODES}" \ - --daemon stop \ - journalnode - ;; -esac +JOURNAL_NODES=$("${HADOOP_HDFS_HOME}/bin/hdfs" getconf -journalNodes 2>&-) + +if [[ "{$JOURNAL_NODES-}" != $'\n' ]]; then + echo "Stopping journal nodes [${JOURNAL_NODES}]" + + hadoop_uservar_su hdfs journalnode "${HADOOP_HDFS_HOME}/bin/hdfs" \ + --workers \ + --config "${HADOOP_CONF_DIR}" \ + --hostnames "${JOURNAL_NODES}" \ + --daemon stop \ + journalnode +fi #--------------------------------------------------------- # ZK Failover controllers, if auto-HA is enabled --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
