Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-2995. svn merge -c 1308174 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308176 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-04-01 18:46:08 +00:00
parent a4873a4341
commit e83f0327d8
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -283,6 +283,9 @@ Release 2.0.0 - UNRELEASED
HDFS-3070. HDFS balancer doesn't ensure that hdfs-site.xml is loaded. (atm) HDFS-3070. HDFS balancer doesn't ensure that hdfs-site.xml is loaded. (atm)
HDFS-2995. start-dfs.sh should only start the 2NN for namenodes
with dfs.namenode.secondary.http-address configured. (eli)
BREAKDOWN OF HDFS-1623 SUBTASKS BREAKDOWN OF HDFS-1623 SUBTASKS
HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd) HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd)

12
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
View File

@ -76,11 +76,13 @@ fi
SECONDARY_NAMENODES=$($HADOOP_PREFIX/bin/hdfs getconf -secondarynamenodes 2>&-) SECONDARY_NAMENODES=$($HADOOP_PREFIX/bin/hdfs getconf -secondarynamenodes 2>&-)
echo "Starting secondary namenodes [$SECONDARY_NAMENODES]" if [ -n "$SECONDARY_NAMENODES" ]; then
echo "Starting secondary namenodes [$SECONDARY_NAMENODES]"
"$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \ "$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \
--config "$HADOOP_CONF_DIR" \ --config "$HADOOP_CONF_DIR" \
--hostnames "$SECONDARY_NAMENODES" \ --hostnames "$SECONDARY_NAMENODES" \
--script "$bin/hdfs" start secondarynamenode --script "$bin/hdfs" start secondarynamenode
fi
# eof # eof

12
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh
View File

@ -52,11 +52,13 @@ fi
SECONDARY_NAMENODES=$($HADOOP_PREFIX/bin/hdfs getconf -secondarynamenodes 2>&-) SECONDARY_NAMENODES=$($HADOOP_PREFIX/bin/hdfs getconf -secondarynamenodes 2>&-)
echo "Stopping secondary namenodes [$SECONDARY_NAMENODES]" if [ -n "$SECONDARY_NAMENODES" ]; then
echo "Stopping secondary namenodes [$SECONDARY_NAMENODES]"
"$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \ "$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \
--config "$HADOOP_CONF_DIR" \ --config "$HADOOP_CONF_DIR" \
--hostnames "$SECONDARY_NAMENODES" \ --hostnames "$SECONDARY_NAMENODES" \
--script "$bin/hdfs" stop secondarynamenode --script "$bin/hdfs" stop secondarynamenode
fi
# eof # eof