bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bm...@apache.org
Subject svn commit: r1211748 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src: common/hadoop/ common/hadoop/conf.pseudo.yarn/ common/hadoop/conf.pseudo/ deb/hadoop/ rpm/hadoop/SPECS/
Date Thu, 08 Dec 2011 02:54:54 GMT
Author: bmahe
Date: Thu Dec  8 02:54:53 2011
New Revision: 1211748

URL: http://svn.apache.org/viewvc?rev=1211748&view=rev
Log:
* Improve deb packages for hadoop 0.23
* Remove references to task/job tracker in hadoop 0.23 spec file
* Add a patch for MAPREDUCE-3436

Added:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
Removed:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo.yarn/yarn-site.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/series
Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/install_init_scripts.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec

Added: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch?rev=1211748&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
(added)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
Thu Dec  8 02:54:53 2011
@@ -0,0 +1,73 @@
+diff --git hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
+index 711dd18..c1da2fe 100644
+--- hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
++++ hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
+@@ -24,6 +24,7 @@ import java.net.InetAddress;
+ import java.net.InetSocketAddress;
+ import java.net.UnknownHostException;
+ import java.util.Calendar;
++import java.util.Iterator;
+ import java.util.LinkedList;
+ import java.util.List;
+ import java.util.concurrent.atomic.AtomicBoolean;
+@@ -46,6 +47,9 @@ import org.apache.hadoop.net.NetUtils;
+ import org.apache.hadoop.security.UserGroupInformation;
+ import org.apache.hadoop.yarn.api.records.ApplicationId;
+ 
++import com.google.common.base.Joiner;
++import com.google.common.base.Splitter;
++
+ public class JobHistoryUtils {
+   
+   /**
+@@ -110,6 +114,9 @@ public class JobHistoryUtils {
+   public static final Pattern TIMESTAMP_DIR_PATTERN = Pattern.compile(TIMESTAMP_DIR_REGEX);
+   private static final String TIMESTAMP_DIR_FORMAT = "%04d" + File.separator + "%02d" +
File.separator + "%02d";
+ 
++  private static final Splitter ADDR_SPLITTER = Splitter.on(':').trimResults();
++  private static final Joiner JOINER = Joiner.on("");
++
+   private static final PathFilter CONF_FILTER = new PathFilter() {
+     @Override
+     public boolean accept(Path path) {
+@@ -478,8 +485,16 @@ public class JobHistoryUtils {
+   public static String getHistoryUrl(Configuration conf, ApplicationId appId) 
+        throws UnknownHostException {
+   //construct the history url for job
+-    String hsAddress = conf.get(JHAdminConfig.MR_HISTORY_WEBAPP_ADDRESS,
++    String addr = conf.get(JHAdminConfig.MR_HISTORY_WEBAPP_ADDRESS,
+         JHAdminConfig.DEFAULT_MR_HISTORY_WEBAPP_ADDRESS);
++    Iterator<String> it = ADDR_SPLITTER.split(addr).iterator();
++    it.next(); // ignore the bind host
++    String port = it.next();
++    // Use hs address to figure out the host for webapp
++    addr = conf.get(JHAdminConfig.MR_HISTORY_ADDRESS,
++        JHAdminConfig.DEFAULT_MR_HISTORY_ADDRESS);
++    String host = ADDR_SPLITTER.split(addr).iterator().next();
++    String hsAddress = JOINER.join(host, ":", port);
+     InetSocketAddress address = NetUtils.createSocketAddr(
+       hsAddress, JHAdminConfig.DEFAULT_MR_HISTORY_WEBAPP_PORT,
+       JHAdminConfig.DEFAULT_MR_HISTORY_WEBAPP_ADDRESS);
+diff --git hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
+index 5d02250..140d93a 100644
+--- hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
++++ hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
+@@ -1224,4 +1224,18 @@
+     mapreduce.job.end-notification.max.retry.interval</description>
+ </property>
+ 
++<!-- jobhistory properties -->
++
++<property>
++  <name>mapreduce.jobhistory.address</name>
++  <value>0.0.0.0:10020</value>
++  <description>MapReduce JobHistory Server host:port</description>
++</property>
++
++<property>
++  <name>mapreduce.jobhistory.webapp.address</name>
++  <value>0.0.0.0:19888</value>
++  <description>MapReduce JobHistory Server Web UI host:port</description>
++</property>
++
+ </configuration>

Added: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml?rev=1211748&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
(added)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
Thu Dec  8 02:54:53 2011
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+  <property>
+    <name>yarn.nodemanager.aux-services</name>
+    <value>mapreduce.shuffle</value>
+  </property>
+
+  <property>
+    <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name>
+    <value>org.apache.hadoop.mapred.ShuffleHandler</value>
+  </property>
+
+</configuration>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1211748&r1=1211747&r2=1211748&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Thu Dec  8 02:54:53 2011
@@ -44,7 +44,6 @@ OPTS=$(getopt \
   -l 'system-lib-dir:' \
   -l 'system-libexec-dir:' \
   -l 'hadoop-etc-dir:' \
-  -l 'yarn-etc-dir:' \
   -l 'doc-dir:' \
   -l 'man-dir:' \
   -l 'example-dir:' \
@@ -88,9 +87,6 @@ while true ; do
         --hadoop-etc-dir)
         HADOOP_ETC_DIR=$2 ; shift 2
         ;;
-        --yarn-etc-dir)
-        YARN_ETC_DIR=$2 ; shift 2
-        ;;
         --installed-lib-dir)
         INSTALLED_LIB_DIR=$2 ; shift 2
         ;;
@@ -127,7 +123,6 @@ SYSTEM_INCLUDE_DIR=${SYSTEM_INCLUDE_DIR:
 SYSTEM_LIBEXEC_DIR=${SYSTEM_LIBEXEC_DIR:-$PREFIX/usr/libexec}
 EXAMPLE_DIR=${EXAMPLE_DIR:-$DOC_DIR/examples}
 HADOOP_ETC_DIR=${HADOOP_ETC_DIR:-$PREFIX/etc/hadoop}
-YARN_ETC_DIR=${YARN_ETC_DIR:-$PREFIX/etc/yarn}
 
 INSTALLED_HADOOP_DIR=${INSTALLED_HADOOP_DIR:-/usr/lib/hadoop}
 
@@ -168,6 +163,13 @@ EOF
   chmod 755 $wrapper
 done
 
+#libexec
+install -d -m 0755 ${SYSTEM_LIBEXEC_DIR}
+rm -fv ${BUILD_DIR}/libexec/jsvc
+mv ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/
+mv ${BUILD_DIR}/bin/*-config.sh ${SYSTEM_LIBEXEC_DIR}/
+
+
 # bin
 install -d -m 0755 ${HADOOP_BIN_DIR}
 cp -a ${BUILD_DIR}/bin/* ${HADOOP_BIN_DIR}/
@@ -212,20 +214,12 @@ for library in libsnappy.so.1.* libhadoo
   ldconfig -vlN ${HADOOP_NATIVE_LIB_DIR}/${library}
 done
 
-#libexec
-install -d -m 0755 ${SYSTEM_LIBEXEC_DIR}
-rm -fv ${BUILD_DIR}/libexec/jsvc
-cp ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/
-cp ${BUILD_DIR}/bin/*-config.sh ${SYSTEM_LIBEXEC_DIR}/
-
 # conf
 install -d -m 0755 $HADOOP_ETC_DIR/conf.empty
-install -d -m 0755 $YARN_ETC_DIR/conf.empty
 
-cp ${BUILD_DIR}/conf/* $YARN_ETC_DIR/conf.empty
+cp ${BUILD_DIR}/conf/* $HADOOP_ETC_DIR/conf.empty
 cp ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/conf.empty
 cp $DISTRO_DIR/mrapp-generated-classpath $HADOOP_ETC_DIR/conf.empty
-cp $DISTRO_DIR/mrapp-generated-classpath $YARN_ETC_DIR/conf.empty
 
 # docs
 install -d -m 0755 ${DOC_DIR}
@@ -248,11 +242,6 @@ for conf in conf.pseudo ; do
   # Overlay the -site files
   (cd $DISTRO_DIR/$conf && tar -cf - .) | (cd $HADOOP_ETC_DIR/$conf && tar
-xf -)
   cp $DISTRO_DIR/mrapp-generated-classpath $HADOOP_ETC_DIR/$conf
-
-  install -d -m 0755 $YARN_ETC_DIR/$conf
-  # Overlay the -site files
-  (cd $DISTRO_DIR/$conf.yarn && tar -cf - .) | (cd $YARN_ETC_DIR/$conf &&
tar -xf -)
-  cp $DISTRO_DIR/mrapp-generated-classpath $YARN_ETC_DIR/$conf
 done
 cp ${BUILD_DIR}/etc/hadoop/log4j.properties $HADOOP_ETC_DIR/conf.pseudo
 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control?rev=1211748&r1=1211747&r2=1211748&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control Thu Dec 
8 02:54:53 2011
@@ -47,30 +47,6 @@ Description: A software platform for pro
  nodes around the cluster. MapReduce can then process the data where it is
  located.
 
-Package: hadoop-native
-Provides: hadoop-native
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, hadoop (= ${source:Version}), liblzo2-2, libzip1
-Enhances: hadoop
-Description: Native libraries for Hadoop (e.g., compression)
- This optional package contains native libraries that increase the performance
- of Hadoop's compression.
-
-Package: hadoop-sbin
-Provides: hadoop-sbin
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, hadoop (= ${source:Version})
-Enhances: hadoop
-Description: Server-side binaries necessary for secured Hadoop clusters
- This package contains a setuid program, 'task-controller', which is used for
- launching MapReduce tasks in a secured MapReduce cluster. This program allows
- the tasks to run as the Unix user who submitted the job, rather than the
- Unix user running the MapReduce daemons.
- .
- This package also contains 'jsvc', a daemon wrapper necessary to allow
- DataNodes to bind to a low (privileged) port and then drop root privileges
- before continuing operation.
-
 Package: hadoop-fuse
 Provides: hadoop-fuse
 Architecture: i386 amd64
@@ -100,30 +76,27 @@ Description: Source code for Hadoop
 Package: hadoop-conf-pseudo
 Provides: hadoop-conf-pseudo
 Architecture: all
-Depends: hadoop (= ${source:Version}), hadoop-namenode (= ${source:Version}), hadoop-datanode
(= ${source:Version}), hadoop-secondarynamenode (= ${source:Version}), hadoop-jobtracker (=
${source:Version}), hadoop-tasktracker (= ${source:Version})
+Depends: hadoop (= ${source:Version}), hadoop-namenode (= ${source:Version}), hadoop-datanode
(= ${source:Version}), hadoop-secondarynamenode (= ${source:Version}), hadoop-resourcemanager
(= ${source:Version}), hadoop-nodemanager (= ${source:Version})
 Description: Pseudo-distributed Hadoop configuration
  Contains configuration files for a "pseudo-distributed" Hadoop deployment.
  In this mode, each of the hadoop components runs as a separate Java process,
  but all on the same machine.
 
-Package: hadoop-tasktracker
-Provides: hadoop-tasktracker
+Package: hadoop-nodemanager
+Provides: hadoop-nodemanager
 Architecture: all
 Depends: hadoop (= ${source:Version})
-Description: Task Tracker for Hadoop
- The Task Tracker is the Hadoop service that accepts MapReduce tasks and
- computes results. Each node in a Hadoop cluster that should be doing
- computation should run a Task Tracker.
+Description: Node manager for Hadoop
+ The NodeManager is the per-machine framework agent who is responsible for
+ containers, monitoring their resource usage (cpu, memory, disk, network) and
+ reporting the same to the ResourceManager/Scheduler.
 
-Package: hadoop-jobtracker
-Provides: hadoop-jobtracker
+Package: hadoop-resourcemanager
+Provides: hadoop-resourcemanager
 Architecture: all
 Depends: hadoop (= ${source:Version})
-Description: Job Tracker for Hadoop
- The jobtracker is a central service which is responsible for managing
- the tasktracker services running on all nodes in a Hadoop Cluster.
- The jobtracker allocates work to the tasktracker nearest to the data
- with an available work slot.
+Description: Resource manager for Hadoop
+ The resource manager manages the global assignment of compute resources to applications.
 
 Package: hadoop-namenode
 Provides: hadoop-namenode

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install?rev=1211748&r1=1211747&r2=1211748&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install Thu
Dec  8 02:54:53 2011
@@ -1,4 +1,5 @@
 /usr/bin
+/usr/libexec
 /usr/lib/hadoop
 /etc/hadoop/conf.empty
 /etc/default/hadoop

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/install_init_scripts.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/install_init_scripts.sh?rev=1211748&r1=1211747&r2=1211748&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/install_init_scripts.sh
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/install_init_scripts.sh
Thu Dec  8 02:54:53 2011
@@ -21,10 +21,10 @@ SRC_PKG=hadoop
 namenode_user=hdfs
 secondarynamenode_user=hdfs
 datanode_user=hdfs
-jobtracker_user=mapred
-tasktracker_user=mapred
+jobtracker_user=yarn
+tasktracker_user=yarn
 
-for node in namenode secondarynamenode jobtracker tasktracker datanode ; do
+for node in namenode secondarynamenode datanode resourcemanager nodemanager; do
     service_pkgdir=debian/$SRC_PKG-$node
     debdir=$service_pkgdir/DEBIAN
     template="debian/service-init.d.tpl"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1211748&r1=1211747&r2=1211748&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules Thu Dec  8
02:54:53 2011
@@ -62,7 +62,6 @@ install: build
 	  --build-dir=${hadoop_build_path} \
 	  --system-lib-dir=debian/tmp/usr/lib/ \
 	  --system-libexec-dir=debian/tmp/usr/libexec/ \
-	  --yarn-etc-dir=debian/tmp/etc/yarn \
 	  --system-include-dir=debian/tmp/usr/include \
 	  --doc-dir=debian/tmp/usr/share/doc/hadoop-doc \
 	  --example-dir=debian/tmp/usr/share/doc/hadoop/examples \
@@ -76,19 +75,20 @@ install: build
 namenode_user=hdfs
 secondarynamenode_user=hdfs
 datanode_user=hdfs
-jobtracker_user=mapred
-tasktracker_user=mapred
+resourcemanager_user=yarn
+nodemanager_user=yarn
 
-namenode secondarynamenode jobtracker tasktracker datanode: debian/service-init.d.tpl
+namenode secondarynamenode datanode resourcemanager nodemanager: debian/service-init.d.tpl
 	sed -e "s|@HADOOP_DAEMON@|$@|" \
             -e "s|@HADOOP_MAJOR_VERSION@|$hadoop_version|" \
 	    -e "s|@DAEMON_USER@|$($@_user)|" $< > debian/hadoop-$@.init
 	# FIXME: workaround for BIGTOP-105
 	sed -e "s|@HADOOP_DAEMON@|$@|" < debian/hadoop.daemon.postinst.tpl > debian/hadoop-$@.postinst
 
-install-indep: namenode secondarynamenode jobtracker tasktracker datanode
+install-indep: namenode secondarynamenode datanode resourcemanager nodemanager
 	mkdir -p debian/tmp/etc/default
 	cp debian/hadoop.default debian/tmp/etc/default/hadoop
+	cp debian/yarn.default debian/tmp/etc/default/yarn
 
 	dh_install --sourcedir=debian/tmp -i
 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl?rev=1211748&r1=1211747&r2=1211748&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl
Thu Dec  8 02:54:53 2011
@@ -47,6 +47,7 @@
 install -d -m 0775 -o root -g hadoop /var/run/hadoop
 
 . /etc/default/hadoop
+. /etc/default/yarn
 
 # Autodetect JAVA_HOME if not defined
 if [ -e /usr/libexec/bigtop-detect-javahome ]; then
@@ -55,10 +56,12 @@ elif [ -e /usr/lib/bigtop-utils/bigtop-d
   . /usr/lib/bigtop-utils/bigtop-detect-javahome
 fi
 
-. $HADOOP_HOME/bin/hadoop-config.sh
+. /usr/libexec/hadoop-config.sh
+. /usr/libexec/yarn-config.sh 
 
 # FIXME: this needs to be removed once hadoop-config.sh stop clobbering HADOOP_HOME
 . /etc/default/hadoop
+. /etc/default/yarn
 
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1211748&r1=1211747&r2=1211748&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Thu Dec  8 02:54:53 2011
@@ -125,6 +125,7 @@ Source7: hadoop-fuse-dfs.1
 Source8: hadoop-fuse.default
 Source9: hadoop.nofiles.conf
 Source10: yarn-init.tmpl
+Patch0: MAPREDUCE-3436_rev2.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
 Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service,
bigtop-utils
@@ -193,18 +194,6 @@ into a checkpoint.  This compaction ensu
 do not incur unnecessary downtime.
 
 
-%package jobtracker
-Summary: Hadoop Job Tracker
-Group: System/Daemons
-Requires: %{name} = %{version}-%{release}
-
-%description jobtracker
-The jobtracker is a central service which is responsible for managing
-the tasktracker services running on all nodes in a Hadoop Cluster.
-The jobtracker allocates work to the tasktracker nearest to the data
-with an available work slot.
-
-
 %package datanode
 Summary: Hadoop Data Node
 Group: System/Daemons
@@ -269,6 +258,7 @@ Hadoop Filesystem Library
 
 %prep
 %setup -n apache-hadoop-common-61572bb
+%patch0 -p0
 
 %build
 # This assumes that you installed Java JDK 6 and set JAVA_HOME



Mime
View raw message