]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: reserve 2500MB per build job 30370/head
authorDan van der Ster <daniel.vanderster@cern.ch>
Wed, 4 Sep 2019 08:34:42 +0000 (10:34 +0200)
committerPrashant D <pdhange@redhat.com>
Thu, 12 Sep 2019 23:03:16 +0000 (19:03 -0400)
On our 14GB build machines, 8 parallel jobs results in the compiler
going OOM. Reserving 2500MB per job allows it to succeed with 5 jobs.

Fixes: https://tracker.ceph.com/issues/41659
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit e466c43b2371d74477ae51c57df362491afd0fd5)

ceph.spec.in

index 734542815756d37bcb995ba55bdfd8716cbeb4f2..5cf650e71728b7abdc42dd0a5f44975afab5b634 100644 (file)
@@ -1116,7 +1116,7 @@ free -h
 echo "System limits:"
 ulimit -a
 if test -n "$CEPH_SMP_NCPUS" -a "$CEPH_SMP_NCPUS" -gt 1 ; then
-    mem_per_process=1800
+    mem_per_process=2500
     max_mem=$(LANG=C free -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p")
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$CEPH_SMP_NCPUS" -gt "$max_jobs" && CEPH_SMP_NCPUS="$max_jobs" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits"