diff -Nru ceph-0.80.8/debian/changelog ceph-0.80.8/debian/changelog --- ceph-0.80.8/debian/changelog 2015-01-23 10:29:11.000000000 -0600 +++ ceph-0.80.8/debian/changelog 2015-02-17 15:02:13.000000000 -0600 @@ -1,3 +1,10 @@ +ceph (0.80.8-0ubuntu1.14.04.1) trusty; urgency=medium + + * Increase file limit to prevent hitting the file limit on large + installations (LP: #1420647) + + -- Dave Chiluk Tue, 17 Feb 2015 14:36:49 -0600 + ceph (0.80.8-0ubuntu0.14.04.1) trusty; urgency=low * New upstream stable point release (LP: #1413917). diff -Nru ceph-0.80.8/debian/patches/increaseFileLimit.patch ceph-0.80.8/debian/patches/increaseFileLimit.patch --- ceph-0.80.8/debian/patches/increaseFileLimit.patch 1969-12-31 18:00:00.000000000 -0600 +++ ceph-0.80.8/debian/patches/increaseFileLimit.patch 2015-02-17 14:51:20.000000000 -0600 @@ -0,0 +1,32 @@ +Description: Increase file limit to prevent hitting the file limit + +Upstream commit text +" +commit 5773a374d0089ce824dec0a0c74a76e57806cc43 +Author: Sage Weil +Date: Mon Jul 28 09:27:20 2014 -0700 + + upstart/ceph-osd.conf: bump nofile limit up by 10x + + This should ensure that we don't hit this limit on all but the very biggest + clusters. We seen it hit on a ~500 OSD dumpling cluster. + + Backport: firefly, dumpling + Signed-off-by: Sage Weil +" + +Author: Dave Chiluk +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1420647 +Origin: https://github.com/ceph/ceph/commit/5773a374d0089ce824dec0a0c74a76e57806cc43 +--- +--- ceph-0.80.8.orig/src/upstart/ceph-osd.conf ++++ ceph-0.80.8/src/upstart/ceph-osd.conf +@@ -6,7 +6,7 @@ stop on runlevel [!2345] or stopping cep + respawn + respawn limit 5 30 + +-limit nofile 32768 32768 ++limit nofile 327680 327680 + + pre-start script + set -e diff -Nru ceph-0.80.8/debian/patches/series ceph-0.80.8/debian/patches/series --- ceph-0.80.8/debian/patches/series 2015-01-23 03:07:04.000000000 -0600 +++ ceph-0.80.8/debian/patches/series 2015-02-17 14:49:08.000000000 -0600 @@ -1,2 +1,3 @@ virtualenv-never-download modules.patch +increaseFileLimit.patch