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 2012/02/08 21:01:11 UTC
svn commit: r1242060 - in /incubator/bigtop/trunk/bigtop-packages/src:
common/hadoop/hadoop.nofiles.conf common/hadoop/hdfs.conf
common/hadoop/mapred.conf deb/hadoop/hadoop.install deb/hadoop/rules
rpm/hadoop/SPECS/hadoop.spec
Author: rvs
Date: Wed Feb 8 20:01:10 2012
New Revision: 1242060
URL: http://svn.apache.org/viewvc?rev=1242060&view=rev
Log:
BIGTOP-393. hadoop packages don't set nproc
Added:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hdfs.conf
- copied, changed from r1242015, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapred.conf
- copied, changed from r1242015, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
Removed:
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
Copied: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hdfs.conf (from r1242015, 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/hdfs.conf?p2=incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hdfs.conf&p1=incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf&r1=1242015&r2=1242060&rev=1242060&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hdfs.conf Wed Feb 8 20:01:10 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
+hdfs - nofile 32768
+hdfs - nproc 65536
Copied: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapred.conf (from r1242015, 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/mapred.conf?p2=incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapred.conf&p1=incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf&r1=1242015&r2=1242060&rev=1242060&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapred.conf Wed Feb 8 20:01:10 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
+mapred - nproc 65536
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=1242060&r1=1242059&r2=1242060&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install Wed Feb 8 20:01:10 2012
@@ -2,5 +2,6 @@
/usr/lib/hadoop
/etc/hadoop/conf.empty
/etc/default/hadoop
-/etc/security/limits.d/hadoop.nofiles.conf
+/etc/security/limits.d/hdfs.conf
+/etc/security/limits.d/mapred.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=1242060&r1=1242059&r2=1242060&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules Wed Feb 8 20:01:10 2012
@@ -107,7 +107,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/mapred.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=1242060&r1=1242059&r2=1242060&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 Wed Feb 8 20:01:10 2012
@@ -115,7 +115,8 @@ 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: mapred.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, bigtop-utils
@@ -377,7 +378,8 @@ done
%__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
+%__install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT/etc/security/limits.d/hdfs.conf
+%__install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/etc/security/limits.d/mapred.conf
# /var/lib/hadoop/cache
%__install -d -m 1777 $RPM_BUILD_ROOT/var/lib/%{name}/cache
@@ -422,7 +424,8 @@ fi
%defattr(-,root,root)
%config(noreplace) %{etc_hadoop}/conf.empty
%config(noreplace) /etc/default/hadoop
-%config(noreplace) /etc/security/limits.d/hadoop.nofiles.conf
+%config(noreplace) /etc/security/limits.d/hdfs.conf
+%config(noreplace) /etc/security/limits.d/mapred.conf
%{lib_hadoop}
%{bin_hadoop}/%{name}
%{man_hadoop}/man1/hadoop.1.*z