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

Merge -r 1170232:1170233 from trunk to branch. Fixes: HDFS-2323. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170241 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2011-09-13 17:05:02 +00:00
parent 1c3e1213e6
commit 3f6ae51a7a
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1007,6 +1007,7 @@ Release 0.23.0 - Unreleased
HDFS-2314. MRV1 test compilation broken after HDFS-2197 (todd) HDFS-2314. MRV1 test compilation broken after HDFS-2197 (todd)
HDFS-2323. start-dfs.sh script fails for tarball install (tomwhite)
BREAKDOWN OF HDFS-1073 SUBTASKS BREAKDOWN OF HDFS-1073 SUBTASKS

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

@ -51,7 +51,7 @@ NAMENODES=$($HADOOP_PREFIX/bin/hdfs getconf -namenodes)
echo "Starting namenodes on [$NAMENODES]" echo "Starting namenodes on [$NAMENODES]"
"$HADOOP_PREFIX/bin/hadoop-daemons.sh" \ "$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \
--config "$HADOOP_CONF_DIR" \ --config "$HADOOP_CONF_DIR" \
--hostnames "$NAMENODES" \ --hostnames "$NAMENODES" \
--script "$bin/hdfs" start namenode $nameStartOpt --script "$bin/hdfs" start namenode $nameStartOpt
@ -64,7 +64,7 @@ if [ -n "$HADOOP_SECURE_DN_USER" ]; then
"Attempting to start secure cluster, skipping datanodes. " \ "Attempting to start secure cluster, skipping datanodes. " \
"Run start-secure-dns.sh as root to complete startup." "Run start-secure-dns.sh as root to complete startup."
else else
"$HADOOP_PREFIX/bin/hadoop-daemons.sh" \ "$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \
--config "$HADOOP_CONF_DIR" \ --config "$HADOOP_CONF_DIR" \
--script "$bin/hdfs" start datanode $dataStartOpt --script "$bin/hdfs" start datanode $dataStartOpt
fi fi
@ -84,7 +84,7 @@ if [ "$SECONDARY_NAMENODES" = '0.0.0.0' ] ; then
else else
echo "Starting secondary namenodes [$SECONDARY_NAMENODES]" echo "Starting secondary namenodes [$SECONDARY_NAMENODES]"
"$HADOOP_PREFIX/bin/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

2
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-secure-dns.sh
View File

@ -25,7 +25,7 @@ bin=`cd "$bin"; pwd`
. "$bin"/../libexec/hdfs-config.sh . "$bin"/../libexec/hdfs-config.sh
if [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then if [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then
"$HADOOP_PREFIX"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs start datanode $dataStartOpt "$HADOOP_PREFIX"/sbin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs start datanode $dataStartOpt
else else
echo $usage echo $usage
fi fi

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

@ -27,7 +27,7 @@ NAMENODES=$($HADOOP_PREFIX/bin/hdfs getconf -namenodes)
echo "Stopping namenodes on [$NAMENODES]" echo "Stopping namenodes on [$NAMENODES]"
"$HADOOP_PREFIX/bin/hadoop-daemons.sh" \ "$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \
--config "$HADOOP_CONF_DIR" \ --config "$HADOOP_CONF_DIR" \
--hostnames "$NAMENODES" \ --hostnames "$NAMENODES" \
--script "$bin/hdfs" stop namenode --script "$bin/hdfs" stop namenode
@ -40,7 +40,7 @@ if [ -n "$HADOOP_SECURE_DN_USER" ]; then
"Attempting to stop secure cluster, skipping datanodes. " \ "Attempting to stop secure cluster, skipping datanodes. " \
"Run stop-secure-dns.sh as root to complete shutdown." "Run stop-secure-dns.sh as root to complete shutdown."
else else
"$HADOOP_PREFIX/bin/hadoop-daemons.sh" \ "$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \
--config "$HADOOP_CONF_DIR" \ --config "$HADOOP_CONF_DIR" \
--script "$bin/hdfs" stop datanode --script "$bin/hdfs" stop datanode
fi fi
@ -60,7 +60,7 @@ if [ "$SECONDARY_NAMENODES" = '0.0.0.0' ] ; then
else else
echo "Stopping secondary namenodes [$SECONDARY_NAMENODES]" echo "Stopping secondary namenodes [$SECONDARY_NAMENODES]"
"$HADOOP_PREFIX/bin/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

2
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-secure-dns.sh
View File

@ -25,7 +25,7 @@ bin=`cd "$bin"; pwd`
. "$bin"/../libexec/hdfs-config.sh . "$bin"/../libexec/hdfs-config.sh
if [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then if [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then
"$HADOOP_PREFIX"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs stop datanode "$HADOOP_PREFIX"/sbin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs stop datanode
else else
echo $usage echo $usage
fi fi

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
View File

@ -227,7 +227,10 @@ public class GetConf extends Configured implements Tool {
void printList(List<InetSocketAddress> list) { void printList(List<InetSocketAddress> list) {
StringBuilder buffer = new StringBuilder(); StringBuilder buffer = new StringBuilder();
for (InetSocketAddress address : list) { for (InetSocketAddress address : list) {
buffer.append(address.getHostName()).append(" "); if (buffer.length() > 0) {
buffer.append(" ");
}
buffer.append(address.getHostName());
} }
printOut(buffer.toString()); printOut(buffer.toString());
} }