From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 5 Oct 2017 20:22:49 +0000 (+0200)
Subject: Revert "Revert "Drop any systemd imposed process/thread limits""
X-Git-Tag: ses5-gm~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42e5393a853a56f1814efe9cd598a8e22ee43ec2;p=ceph.git

Revert "Revert "Drop any systemd imposed process/thread limits""

This reverts commit 725343ebed6ee018118bd05bd237d3c5f089d01c.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Conflicts: (all trivial resolution)
	systemd/ceph-mds@.service
	systemd/ceph-mon@.service
	systemd/ceph-osd@.service
	systemd/ceph-radosgw@.service
---

diff --git a/systemd/ceph-mds@.service b/systemd/ceph-mds@.service
index 8284982ebd3..97b716dc3f7 100644
--- a/systemd/ceph-mds@.service
+++ b/systemd/ceph-mds@.service
@@ -11,6 +11,7 @@ EnvironmentFile=-/etc/sysconfig/ceph
 Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
 ExecReload=/bin/kill -HUP $MAINPID
+TasksMax=infinity
 Restart=on-failure
 StartLimitInterval=30min
 StartLimitBurst=3
diff --git a/systemd/ceph-mon@.service b/systemd/ceph-mon@.service
index 942531cd383..d6148edd0dc 100644
--- a/systemd/ceph-mon@.service
+++ b/systemd/ceph-mon@.service
@@ -17,6 +17,7 @@ EnvironmentFile=-/etc/sysconfig/ceph
 Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
 ExecReload=/bin/kill -HUP $MAINPID
+TasksMax=infinity
 Restart=on-failure
 StartLimitInterval=30min
 StartLimitBurst=5
diff --git a/systemd/ceph-osd@.service b/systemd/ceph-osd@.service
index af79dbb0422..668e89553df 100644
--- a/systemd/ceph-osd@.service
+++ b/systemd/ceph-osd@.service
@@ -12,6 +12,7 @@ Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
 ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
 ExecReload=/bin/kill -HUP $MAINPID
+TasksMax=infinity
 Restart=on-failure
 StartLimitInterval=30min
 StartLimitBurst=30
diff --git a/systemd/ceph-radosgw@.service b/systemd/ceph-radosgw@.service
index 2c4b04f7a8b..ff81335c436 100644
--- a/systemd/ceph-radosgw@.service
+++ b/systemd/ceph-radosgw@.service
@@ -10,6 +10,7 @@ LimitNPROC=1048576
 EnvironmentFile=-/etc/sysconfig/ceph
 Environment=CLUSTER=ceph
 ExecStart=/usr/bin/radosgw -f --cluster ${CLUSTER} --name client.%i --setuser ceph --setgroup ceph
+TasksMax=infinity
 Restart=on-failure
 StartLimitInterval=30s
 StartLimitBurst=5
diff --git a/systemd/ceph-rbd-mirror@.service b/systemd/ceph-rbd-mirror@.service
index 4c2e2f060be..d38aec524e8 100644
--- a/systemd/ceph-rbd-mirror@.service
+++ b/systemd/ceph-rbd-mirror@.service
@@ -17,6 +17,7 @@ PrivateTmp=true
 Restart=on-failure
 StartLimitInterval=30min
 StartLimitBurst=3
+TasksMax=infinity
 
 [Install]
 WantedBy=ceph-rbd-mirror.target