You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2010/06/11 01:43:27 UTC
svn commit: r953502 - in /hadoop/hdfs/branches/branch-0.21: ./ bin/ conf/
Author: tomwhite
Date: Thu Jun 10 23:43:25 2010
New Revision: 953502
URL: http://svn.apache.org/viewvc?rev=953502&view=rev
Log:
Merge -r 953489:953490 from trunk to branch-0.21. Fixes: HADOOP-6794, HDFS-1181, MAPREDUCE-1033
Added:
hadoop/hdfs/branches/branch-0.21/bin/
hadoop/hdfs/branches/branch-0.21/bin/hdfs
- copied unchanged from r953495, hadoop/common/branches/branch-0.21/bin/hdfs
hadoop/hdfs/branches/branch-0.21/bin/hdfs-config.sh
- copied, changed from r953495, hadoop/common/branches/branch-0.21/bin/hdfs-config.sh
hadoop/hdfs/branches/branch-0.21/bin/start-balancer.sh
- copied, changed from r953495, hadoop/common/branches/branch-0.21/bin/start-balancer.sh
hadoop/hdfs/branches/branch-0.21/bin/start-dfs.sh
- copied, changed from r953495, hadoop/common/branches/branch-0.21/bin/start-dfs.sh
hadoop/hdfs/branches/branch-0.21/bin/stop-balancer.sh
- copied, changed from r953495, hadoop/common/branches/branch-0.21/bin/stop-balancer.sh
hadoop/hdfs/branches/branch-0.21/bin/stop-dfs.sh
- copied, changed from r953495, hadoop/common/branches/branch-0.21/bin/stop-dfs.sh
Removed:
hadoop/hdfs/branches/branch-0.21/conf/core-site.xml.template
hadoop/hdfs/branches/branch-0.21/conf/hadoop-env.sh.template
hadoop/hdfs/branches/branch-0.21/conf/hadoop-metrics.properties
hadoop/hdfs/branches/branch-0.21/conf/hadoop-policy.xml.template
hadoop/hdfs/branches/branch-0.21/conf/log4j.properties
hadoop/hdfs/branches/branch-0.21/conf/masters.template
hadoop/hdfs/branches/branch-0.21/conf/slaves.template
hadoop/hdfs/branches/branch-0.21/conf/ssl-client.xml.example
hadoop/hdfs/branches/branch-0.21/conf/ssl-server.xml.example
hadoop/hdfs/branches/branch-0.21/conf/taskcontroller.cfg
Modified:
hadoop/hdfs/branches/branch-0.21/CHANGES.txt
hadoop/hdfs/branches/branch-0.21/build.xml
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=953502&r1=953501&r2=953502&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Thu Jun 10 23:43:25 2010
@@ -508,6 +508,8 @@ Release 0.21.0 - Unreleased
HDFS-1161. Make DN minimum valid volumes configurable.
(Eli Collins via tomwhite)
+ HDFS-1181. Move configuration and script files post split. (tomwhite)
+
OPTIMIZATIONS
HDFS-946. NameNode should not return full path name when lisitng a
Copied: hadoop/hdfs/branches/branch-0.21/bin/hdfs-config.sh (from r953495, hadoop/common/branches/branch-0.21/bin/hdfs-config.sh)
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/bin/hdfs-config.sh?p2=hadoop/hdfs/branches/branch-0.21/bin/hdfs-config.sh&p1=hadoop/common/branches/branch-0.21/bin/hdfs-config.sh&r1=953495&r2=953502&rev=953502&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/bin/hdfs-config.sh (original)
+++ hadoop/hdfs/branches/branch-0.21/bin/hdfs-config.sh Thu Jun 10 23:43:25 2010
@@ -21,13 +21,13 @@
bin=`dirname "$0"`
bin=`cd "$bin"; pwd`
-#TODO: change the env variable when directory structure is changed
-export HADOOP_CORE_HOME="${HADOOP_CORE_HOME:-$bin/..}"
-#export HADOOP_CORE_HOME="${HADOOP_CORE_HOME:-$bin/../../core}"
+export HADOOP_HDFS_HOME="${HADOOP_HDFS_HOME:-$bin/..}"
-if [ -d "${HADOOP_CORE_HOME}" ]; then
- . "$HADOOP_CORE_HOME"/bin/hadoop-config.sh
+if [ -d "${HADOOP_COMMON_HOME}" ]; then
+ . "$HADOOP_COMMON_HOME"/bin/hadoop-config.sh
+elif [ -d "${HADOOP_HOME}" ]; then
+ . "$HADOOP_HOME"/bin/hadoop-config.sh
else
- echo "Hadoop core not found."
+ echo "Hadoop common not found."
exit
fi
Copied: hadoop/hdfs/branches/branch-0.21/bin/start-balancer.sh (from r953495, hadoop/common/branches/branch-0.21/bin/start-balancer.sh)
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/bin/start-balancer.sh?p2=hadoop/hdfs/branches/branch-0.21/bin/start-balancer.sh&p1=hadoop/common/branches/branch-0.21/bin/start-balancer.sh&r1=953495&r2=953502&rev=953502&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/bin/start-balancer.sh (original)
+++ hadoop/hdfs/branches/branch-0.21/bin/start-balancer.sh Thu Jun 10 23:43:25 2010
@@ -22,4 +22,4 @@ bin=`cd "$bin"; pwd`
# Start balancer daemon.
-"$HADOOP_CORE_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs start balancer $@
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs start balancer $@
Copied: hadoop/hdfs/branches/branch-0.21/bin/start-dfs.sh (from r953495, hadoop/common/branches/branch-0.21/bin/start-dfs.sh)
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/bin/start-dfs.sh?p2=hadoop/hdfs/branches/branch-0.21/bin/start-dfs.sh&p1=hadoop/common/branches/branch-0.21/bin/start-dfs.sh&r1=953495&r2=953502&rev=953502&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/bin/start-dfs.sh (original)
+++ hadoop/hdfs/branches/branch-0.21/bin/start-dfs.sh Thu Jun 10 23:43:25 2010
@@ -47,6 +47,6 @@ fi
# start dfs daemons
# start namenode after datanodes, to minimize time namenode is up w/o data
# note: datanodes will log connection errors until namenode starts
-"$HADOOP_CORE_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs start namenode $nameStartOpt
-"$HADOOP_CORE_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs start datanode $dataStartOpt
-"$HADOOP_CORE_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --hosts masters --script "$bin"/hdfs start secondarynamenode
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs start namenode $nameStartOpt
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs start datanode $dataStartOpt
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --hosts masters --script "$bin"/hdfs start secondarynamenode
Copied: hadoop/hdfs/branches/branch-0.21/bin/stop-balancer.sh (from r953495, hadoop/common/branches/branch-0.21/bin/stop-balancer.sh)
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/bin/stop-balancer.sh?p2=hadoop/hdfs/branches/branch-0.21/bin/stop-balancer.sh&p1=hadoop/common/branches/branch-0.21/bin/stop-balancer.sh&r1=953495&r2=953502&rev=953502&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/bin/stop-balancer.sh (original)
+++ hadoop/hdfs/branches/branch-0.21/bin/stop-balancer.sh Thu Jun 10 23:43:25 2010
@@ -23,4 +23,4 @@ bin=`cd "$bin"; pwd`
# Stop balancer daemon.
# Run this on the machine where the balancer is running
-"$HADOOP_CORE_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs stop balancer
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs stop balancer
Copied: hadoop/hdfs/branches/branch-0.21/bin/stop-dfs.sh (from r953495, hadoop/common/branches/branch-0.21/bin/stop-dfs.sh)
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/bin/stop-dfs.sh?p2=hadoop/hdfs/branches/branch-0.21/bin/stop-dfs.sh&p1=hadoop/common/branches/branch-0.21/bin/stop-dfs.sh&r1=953495&r2=953502&rev=953502&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/bin/stop-dfs.sh (original)
+++ hadoop/hdfs/branches/branch-0.21/bin/stop-dfs.sh Thu Jun 10 23:43:25 2010
@@ -23,6 +23,6 @@ bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh
-"$HADOOP_CORE_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs stop namenode
-"$HADOOP_CORE_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs stop datanode
-"$HADOOP_CORE_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --hosts masters --script "$bin"/hdfs stop secondarynamenode
\ No newline at end of file
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs stop namenode
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/hdfs stop datanode
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --hosts masters --script "$bin"/hdfs stop secondarynamenode
\ No newline at end of file
Modified: hadoop/hdfs/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/build.xml?rev=953502&r1=953501&r2=953502&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/build.xml Thu Jun 10 23:43:25 2010
@@ -920,6 +920,10 @@
<copy todir="${dist.dir}">
<fileset file="${build.dir}/${name}-*.jar"/>
</copy>
+
+ <copy todir="${dist.dir}/bin">
+ <fileset dir="bin"/>
+ </copy>
<copy todir="${dist.dir}/conf">
<fileset dir="${conf.dir}" excludes="**/*.template"/>
@@ -948,6 +952,7 @@
<copy todir="${dist.dir}/" file="build.xml"/>
<chmod perm="ugo+x" type="file" parallel="false">
+ <fileset dir="${dist.dir}/bin"/>
<fileset dir="${dist.dir}/src/contrib/">
<include name="*/bin/*" />
</fileset>
@@ -962,10 +967,12 @@
<macro_tar param.destfile="${build.dir}/${final.name}.tar.gz">
<param.listofitems>
<tarfileset dir="${build.dir}" mode="664">
+ <exclude name="${final.name}/bin/*" />
<exclude name="${final.name}/contrib/*/bin/*" />
<include name="${final.name}/**" />
</tarfileset>
<tarfileset dir="${build.dir}" mode="755">
+ <include name="${final.name}/bin/*" />
<include name="${final.name}/contrib/*/bin/*" />
</tarfileset>
</param.listofitems>
@@ -977,6 +984,7 @@
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
<mkdir dir="${dist.dir}/contrib"/>
+ <mkdir dir="${dist.dir}/bin"/>
<copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
<fileset dir="${common.ivy.lib.dir}"/>
@@ -1003,6 +1011,10 @@
<copy todir="${dist.dir}">
<fileset file="${build.dir}/${name}-*.jar"/>
</copy>
+
+ <copy todir="${dist.dir}/bin">
+ <fileset dir="bin"/>
+ </copy>
<copy todir="${dist.dir}/conf">
<fileset dir="${conf.dir}" excludes="**/*.template"/>
@@ -1022,6 +1034,9 @@
<copy todir="${dist.dir}/" file="build.xml"/>
+ <chmod perm="ugo+x" type="file" parallel="false">
+ <fileset dir="${dist.dir}/bin"/>
+ </chmod>
</target>
<target name="binary-system" depends="bin-package, jar-system, jar-test-system"