Merge HDFS-3469 (r1380003) from trunk (HDFS-3469. start-dfs.sh will start zkfc, but stop-dfs.sh will not stop zkfc similarly. Contributed by Vinay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380006 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8f68f49c3d
commit
2257cd8123
|
@ -542,6 +542,9 @@ Release 2.0.1-alpha - UNRELEASED
|
|||
(omalley)
|
||||
|
||||
HDFS-3879. Fix findbugs warning in TransferFsImage on branch-2. (eli)
|
||||
|
||||
HDFS-3469. start-dfs.sh will start zkfc, but stop-dfs.sh will not stop zkfc similarly.
|
||||
(Vinay via umamahesh)
|
||||
|
||||
BREAKDOWN OF HDFS-3042 SUBTASKS
|
||||
|
||||
|
|
|
@ -61,4 +61,14 @@ if [ -n "$SECONDARY_NAMENODES" ]; then
|
|||
--script "$bin/hdfs" stop secondarynamenode
|
||||
fi
|
||||
|
||||
#---------------------------------------------------------
|
||||
# ZK Failover controllers, if auto-HA is enabled
|
||||
AUTOHA_ENABLED=$($HADOOP_PREFIX/bin/hdfs getconf -confKey dfs.ha.automatic-failover.enabled)
|
||||
if [ "$(echo "$AUTOHA_ENABLED" | tr A-Z a-z)" = "true" ]; then
|
||||
echo "Stopping ZK Failover Controllers on NN hosts [$NAMENODES]"
|
||||
"$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \
|
||||
--config "$HADOOP_CONF_DIR" \
|
||||
--hostnames "$NAMENODES" \
|
||||
--script "$bin/hdfs" stop zkfc
|
||||
fi
|
||||
# eof
|
||||
|
|
Loading…
Reference in New Issue