hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r953490 - in /hadoop/mapreduce/trunk: ./ bin/ conf/ src/contrib/mumak/bin/
Date Thu, 10 Jun 2010 23:01:35 GMT
Author: tomwhite
Date: Thu Jun 10 23:01:33 2010
New Revision: 953490

URL: http://svn.apache.org/viewvc?rev=953490&view=rev
Log:
HADOOP-6794. Move configuration and script files post split. Includes HDFS-1181, MAPREDUCE-1033.

Added:
    hadoop/mapreduce/trunk/bin/
    hadoop/mapreduce/trunk/bin/mapred
      - copied unchanged from r953479, hadoop/common/trunk/bin/mapred
    hadoop/mapreduce/trunk/bin/mapred-config.sh
      - copied, changed from r953479, hadoop/common/trunk/bin/mapred-config.sh
    hadoop/mapreduce/trunk/bin/start-mapred.sh
      - copied, changed from r953479, hadoop/common/trunk/bin/start-mapred.sh
    hadoop/mapreduce/trunk/bin/stop-mapred.sh
      - copied, changed from r953479, hadoop/common/trunk/bin/stop-mapred.sh
Removed:
    hadoop/mapreduce/trunk/conf/core-site.xml.template
    hadoop/mapreduce/trunk/conf/hadoop-env.sh.template
    hadoop/mapreduce/trunk/conf/hadoop-metrics.properties
    hadoop/mapreduce/trunk/conf/hadoop-policy.xml.template
    hadoop/mapreduce/trunk/conf/hdfs-site.xml.template
    hadoop/mapreduce/trunk/conf/log4j.properties
    hadoop/mapreduce/trunk/conf/masters.template
    hadoop/mapreduce/trunk/conf/slaves.template
    hadoop/mapreduce/trunk/conf/ssl-client.xml.example
    hadoop/mapreduce/trunk/conf/ssl-server.xml.example
Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/build.xml
    hadoop/mapreduce/trunk/src/contrib/mumak/bin/mumak.sh

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=953490&r1=953489&r2=953490&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Jun 10 23:01:33 2010
@@ -829,6 +829,9 @@ Release 0.21.0 - Unreleased
     in favour of -files option in streaming. (Amareshwari Sriramadasu
     via vinodkv)
 
+    MAPREDUCE-1033. Resolve location of scripts and configuration files after
+    project split. (tomwhite)
+
   OPTIMIZATIONS
 
     MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band

Copied: hadoop/mapreduce/trunk/bin/mapred-config.sh (from r953479, hadoop/common/trunk/bin/mapred-config.sh)
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/bin/mapred-config.sh?p2=hadoop/mapreduce/trunk/bin/mapred-config.sh&p1=hadoop/common/trunk/bin/mapred-config.sh&r1=953479&r2=953490&rev=953490&view=diff
==============================================================================
--- hadoop/common/trunk/bin/mapred-config.sh (original)
+++ hadoop/mapreduce/trunk/bin/mapred-config.sh Thu Jun 10 23:01:33 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_MAPRED_HOME="${HADOOP_MAPRED_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/mapreduce/trunk/bin/start-mapred.sh (from r953479, hadoop/common/trunk/bin/start-mapred.sh)
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/bin/start-mapred.sh?p2=hadoop/mapreduce/trunk/bin/start-mapred.sh&p1=hadoop/common/trunk/bin/start-mapred.sh&r1=953479&r2=953490&rev=953490&view=diff
==============================================================================
--- hadoop/common/trunk/bin/start-mapred.sh (original)
+++ hadoop/mapreduce/trunk/bin/start-mapred.sh Thu Jun 10 23:01:33 2010
@@ -25,5 +25,5 @@ bin=`cd "$bin"; pwd`
 
 # start mapred daemons
 # start jobtracker first to minimize connection errors at startup
-"$HADOOP_CORE_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/mapred
start jobtracker
-"$HADOOP_CORE_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/mapred
start tasktracker
\ No newline at end of file
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/mapred
start jobtracker
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/mapred
start tasktracker
\ No newline at end of file

Copied: hadoop/mapreduce/trunk/bin/stop-mapred.sh (from r953479, hadoop/common/trunk/bin/stop-mapred.sh)
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/bin/stop-mapred.sh?p2=hadoop/mapreduce/trunk/bin/stop-mapred.sh&p1=hadoop/common/trunk/bin/stop-mapred.sh&r1=953479&r2=953490&rev=953490&view=diff
==============================================================================
--- hadoop/common/trunk/bin/stop-mapred.sh (original)
+++ hadoop/mapreduce/trunk/bin/stop-mapred.sh Thu Jun 10 23:01:33 2010
@@ -23,5 +23,5 @@ bin=`cd "$bin"; pwd`
 
 . $bin/mapred-config.sh
 
-"$HADOOP_CORE_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/mapred
stop jobtracker
-"$HADOOP_CORE_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/mapred
stop tasktracker
\ No newline at end of file
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemon.sh --config $HADOOP_CONF_DIR --script "$bin"/mapred
stop jobtracker
+"$HADOOP_COMMON_HOME"/bin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script "$bin"/mapred
stop tasktracker
\ No newline at end of file

Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=953490&r1=953489&r2=953490&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Thu Jun 10 23:01:33 2010
@@ -1073,6 +1073,9 @@
       <fileset file="${build.dir}/${tools.final.name}.jar"/> 
     </copy>
     
+    <copy todir="${dist.dir}/bin">
+      <fileset dir="bin"/>
+    </copy>
 
     <copy todir="${dist.dir}/conf">
       <fileset dir="${conf.dir}" excludes="**/*.template"/>
@@ -1105,6 +1108,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>
@@ -1170,6 +1174,10 @@
       <fileset file="${build.dir}/${tools.final.name}.jar"/> -->
     </copy>
     
+    <copy todir="${dist.dir}/bin">
+      <fileset dir="bin"/>
+    </copy>
+      	
     <copy todir="${dist.dir}/conf">
       <fileset dir="${conf.dir}" excludes="**/*.template"/>
     </copy>
@@ -1203,6 +1211,9 @@
           <exclude name="${final.name}/docs/**" />
           <include name="${final.name}/**" />
         </tarfileset>
+        <tarfileset dir="${build.dir}" mode="755">
+          <include name="${final.name}/bin/*" />
+        </tarfileset>
       </param.listofitems>
     </macro_tar>
   </target>

Modified: hadoop/mapreduce/trunk/src/contrib/mumak/bin/mumak.sh
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mumak/bin/mumak.sh?rev=953490&r1=953489&r2=953490&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mumak/bin/mumak.sh (original)
+++ hadoop/mapreduce/trunk/src/contrib/mumak/bin/mumak.sh Thu Jun 10 23:01:33 2010
@@ -70,9 +70,9 @@ if [ -f "${HADOOP_CONF_DIR}/hadoop-env.s
   . "${HADOOP_CONF_DIR}/hadoop-env.sh"
 fi
 
-# Define HADOOP_CORE_HOME
+# Define HADOOP_COMMON_HOME
 if [ "$HADOP_CORE_HOME" = "" ]; then
-  HADOOP_CORE_HOME=$HADOOP_HOME
+  HADOOP_COMMON_HOME=$HADOOP_HOME
 fi
 
 if [ "$JAVA_HOME" = "" ]; then
@@ -144,18 +144,18 @@ fi
 
 # setup 'java.library.path' for native-hadoop code if necessary
 JAVA_LIBRARY_PATH=''
-if [ -d "${HADOOP_CORE_HOME}/build/native" -o -d "${HADOOP_CORE_HOME}/lib/native" ]; then
+if [ -d "${HADOOP_COMMON_HOME}/build/native" -o -d "${HADOOP_COMMON_HOME}/lib/native" ];
then
   JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} -Xmx32m org.apache.hadoop.util.PlatformName
| sed -e "s/ /_/g"`
   
-  if [ -d "$HADOOP_CORE_HOME/build/native" ]; then
-    JAVA_LIBRARY_PATH=${HADOOP_CORE_HOME}/build/native/${JAVA_PLATFORM}/lib
+  if [ -d "$HADOOP_COMMON_HOME/build/native" ]; then
+    JAVA_LIBRARY_PATH=${HADOOP_COMMON_HOME}/build/native/${JAVA_PLATFORM}/lib
   fi
   
-  if [ -d "${HADOOP_CORE_HOME}/lib/native" ]; then
+  if [ -d "${HADOOP_COMMON_HOME}/lib/native" ]; then
     if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
-      JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:${HADOOP_CORE_HOME}/lib/native/${JAVA_PLATFORM}
+      JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:${HADOOP_COMMON_HOME}/lib/native/${JAVA_PLATFORM}
     else
-      JAVA_LIBRARY_PATH=${HADOOP_CORE_HOME}/lib/native/${JAVA_PLATFORM}
+      JAVA_LIBRARY_PATH=${HADOOP_COMMON_HOME}/lib/native/${JAVA_PLATFORM}
     fi
   fi
 fi



Mime
View raw message