You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2011/10/21 00:05:35 UTC

svn commit: r1187088 - in /incubator/bigtop/trunk/bigtop-packages/src: common/hadoop/hadoop.nofiles.conf deb/hadoop/hadoop.install deb/hadoop/rules rpm/hadoop/SPECS/hadoop.spec

Author: rvs
Date: Thu Oct 20 22:05:34 2011
New Revision: 1187088

URL: http://svn.apache.org/viewvc?rev=1187088&view=rev
Log:
BIGTOP-133. hadoop packages should set up nofile limits automatically

Added:
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
Modified:
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec

Added: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf?rev=1187088&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf Thu Oct 20 22:05:34 2011
@@ -0,0 +1,2 @@
+hdfs - nofile 32768
+mapred - nofile 32768

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install?rev=1187088&r1=1187087&r2=1187088&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install Thu Oct 20 22:05:34 2011
@@ -2,4 +2,5 @@
 /usr/lib/hadoop
 /etc/hadoop/conf.empty
 /etc/default/hadoop
+/etc/security/limits.d/hadoop.nofiles.conf
 /usr/share/doc/hadoop

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules?rev=1187088&r1=1187087&r2=1187088&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules Thu Oct 20 22:05:34 2011
@@ -100,6 +100,8 @@ install-indep: namenode secondarynamenod
 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
 	dh_install --sourcedir=debian/tmp -s
 
 # Must not depend on anything. This is to be called by

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1187088&r1=1187087&r2=1187088&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Thu Oct 20 22:05:34 2011
@@ -113,6 +113,7 @@ Source5: hadoop-init.tmpl.suse
 Source6: hadoop.1
 Source7: hadoop-fuse-dfs.1
 Source8: hadoop-fuse.default
+Source9: hadoop.nofiles.conf
 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
@@ -369,6 +370,8 @@ done
 %__cp $RPM_SOURCE_DIR/hadoop.default $RPM_BUILD_ROOT/etc/default/hadoop
 %__cp $RPM_SOURCE_DIR/hadoop-fuse.default $RPM_BUILD_ROOT/etc/default/hadoop-fuse
 
+%__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
 
 # /var/lib/hadoop/cache
 %__install -d -m 1777 $RPM_BUILD_ROOT/var/lib/%{name}/cache
@@ -413,6 +416,7 @@ fi
 %defattr(-,root,root)
 %config(noreplace) %{etc_hadoop}/conf.empty
 %config(noreplace) /etc/default/hadoop
+%config(noreplace) /etc/security/limits.d/hadoop.nofiles.conf
 %{lib_hadoop}
 %{bin_hadoop}/%{name}
 %{man_hadoop}/man1/hadoop.1.*z