Author: rvs
Date: Wed Feb 8 20:06:38 2012
New Revision: 1242065
URL: http://svn.apache.org/viewvc?rev=1242065&view=rev
Log:
BIGTOP-393. hadoop packages don't set nproc
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.conf
- copied, changed from r1241745,
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.conf
- copied, changed from r1241745,
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.conf
- copied, changed from r1241745,
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
Removed:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Copied:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.conf
(from r1241745,
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.conf?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.conf&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf&r1=1241745&r2=1242065&rev=1242065&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.conf
Wed Feb 8 20:06:38 2012
@@ -14,4 +14,3 @@
# limitations under the License.
hdfs - nofile 32768
-mapred - nofile 32768
Copied:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.conf
(from r1241745,
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.conf?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.conf&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf&r1=1241745&r2=1242065&rev=1242065&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.conf
Wed Feb 8 20:06:38 2012
@@ -13,5 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-hdfs - nofile 32768
-mapred - nofile 32768
+mapred - nofile 32768
+mapred - nproc 65536
+mapreduce - nofile 32768
+mapreduce - nproc 65536
Copied:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.conf
(from r1241745,
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.conf?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.conf&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf&r1=1241745&r2=1242065&rev=1242065&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.conf
Wed Feb 8 20:06:38 2012
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-hdfs - nofile 32768
-mapred - nofile 32768
+yarn - nofile 32768
+yarn - nproc 65536
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install?rev=1242065&r1=1242064&r2=1242065&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
Wed Feb 8 20:06:38 2012
@@ -1,3 +1,4 @@
+/etc/security/limits.d/hdfs.conf
/etc/hadoop/conf.empty/hdfs-site.xml
/usr/lib/hadoop/hadoop-hdfs*.jar
/usr/lib/hadoop/hadoop-archives*.jar
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install?rev=1242065&r1=1242064&r2=1242065&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
Wed Feb 8 20:06:38 2012
@@ -1,3 +1,4 @@
+/etc/security/limits.d/mapreduce.conf
/usr/lib/hadoop/hadoop-mapreduce*.jar
/usr/lib/hadoop/hadoop-streaming*.jar
/usr/lib/hadoop/libexec/mapred-config.sh
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install?rev=1242065&r1=1242064&r2=1242065&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install
Wed Feb 8 20:06:38 2012
@@ -1,3 +1,4 @@
+/etc/security/limits.d/yarn.conf
/etc/hadoop/conf.empty/yarn-env.sh
/etc/hadoop/conf.empty/yarn-site.xml
/etc/hadoop/conf.empty/mrapp-generated-classpath
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=1242065&r1=1242064&r2=1242065&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
Wed Feb 8 20:06:38 2012
@@ -5,7 +5,6 @@
/etc/hadoop/conf.empty/ssl-client.xml.example
/etc/hadoop/conf.empty/ssl-server.xml.example
/etc/default/hadoop
-/etc/security/limits.d/hadoop.nofiles.conf
/usr/lib/hadoop/hadoop-common*.jar
/usr/lib/hadoop/hadoop-auth*.jar
/usr/lib/hadoop/hadoop-annotations*.jar
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=1242065&r1=1242064&r2=1242065&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
Wed Feb 8 20:06:38 2012
@@ -126,7 +126,7 @@ install-arch:
mkdir -p debian/tmp/etc/default
cp debian/hadoop-fuse.default debian/tmp/etc/default/hadoop-fuse
mkdir -p debian/tmp/etc/security/limits.d
- cp debian/hadoop.nofiles.conf debian/tmp/etc/security/limits.d
+ cp debian/hdfs.conf debian/yarn.conf debian/mapreduce.conf
debian/tmp/etc/security/limits.d
dh_install --sourcedir=debian/tmp -s
# Must not depend on anything. This is to be called by
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=1242065&r1=1242064&r2=1242065&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
Wed Feb 8 20:06:38 2012
@@ -142,10 +142,12 @@ Source5: hadoop-init.tmpl.suse
Source6: hadoop.1
Source7: hadoop-fuse-dfs.1
Source8: hadoop-fuse.default
-Source9: hadoop.nofiles.conf
+Source9: hdfs.conf
Source10: yarn-init.tmpl
Source11: hadoop-httpfs.default
Source12: service-hadoop-httpfs
+Source13: yarn.conf
+Source14: mapreduce.conf
Patch0: MAPREDUCE-3436_rev2.patch
Patch1: MAPREDUCE-3791.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
@@ -422,7 +424,9 @@ chmod 755 $RPM_BUILD_ROOT/%{initd_dir}/%
%__cp $RPM_SOURCE_DIR/%{name}-httpfs.default
$RPM_BUILD_ROOT/etc/default/%{name}-httpfs
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/security/limits.d
-%__install -m 0644 %{SOURCE9}
$RPM_BUILD_ROOT/etc/security/limits.d/hadoop.nofiles.conf
+%__install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT/etc/security/limits.d/hdfs.conf
+%__install -m 0644 %{SOURCE13} $RPM_BUILD_ROOT/etc/security/limits.d/yarn.conf
+%__install -m 0644 %{SOURCE14}
$RPM_BUILD_ROOT/etc/security/limits.d/mapreduce.conf
# /var/lib/*/cache
%__install -d -m 1777 $RPM_BUILD_ROOT/%{state_hadoop}/cache
@@ -508,6 +512,7 @@ fi
%config(noreplace) %{etc_hadoop}/conf.empty/yarn-site.xml
%config(noreplace) %{etc_hadoop}/conf.empty/mrapp-generated-classpath
%config(noreplace) /etc/default/yarn
+%config(noreplace) /etc/security/limits.d/yarn.conf
%{lib_hadoop}/hadoop-yarn*.jar
%{lib_hadoop}/libexec/yarn-config.sh
%{lib_hadoop}/sbin/start-yarn.sh
@@ -526,6 +531,7 @@ fi
%defattr(-,root,root)
%config(noreplace) %{etc_hadoop}/conf.empty/hdfs-site.xml
%config(noreplace) /etc/default/hadoop-fuse
+%config(noreplace) /etc/security/limits.d/hdfs.conf
%{lib_hadoop}/hadoop-hdfs*.jar
%{lib_hadoop}/hadoop-archives*.jar
%{lib_hadoop}/libexec/hdfs-config.sh
@@ -549,6 +555,7 @@ fi
%files mapreduce
%defattr(-,root,root)
+%config(noreplace) /etc/security/limits.d/mapreduce.conf
%{lib_hadoop}/hadoop-mapreduce*.jar
%{lib_hadoop}/hadoop-streaming*.jar
%{lib_hadoop}/libexec/mapred-config.sh
@@ -569,7 +576,6 @@ fi
%config(noreplace) %{etc_hadoop}/conf.empty/ssl-client.xml.example
%config(noreplace) %{etc_hadoop}/conf.empty/ssl-server.xml.example
%config(noreplace) /etc/default/hadoop
-%config(noreplace) /etc/security/limits.d/hadoop.nofiles.conf
%{lib_hadoop}/hadoop-common*.jar
%{lib_hadoop}/hadoop-auth*.jar
%{lib_hadoop}/hadoop-annotations*.jar
