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 8284982ebd309b0c81debb78a3f751973fb16aeb..97b716dc3f763602443cb539f0e18861ee9333aa 100644 (file)
--- 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 942531cd383d883c64ed65dec47f0cd8cf973818..d6148edd0dcd1413af10c11b3a90a59fc1e851d0 100644 (file)
--- 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 af79dbb0422c97a9331f1f9f67b1858f534b16bb..668e89553dfb62e3914a2b6391c60cbb88004d27 100644 (file)
--- 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 2c4b04f7a8b23e9c003b9b46ae283848e90504c8..ff81335c4364cfe21f06e42ebadc5c2ce73e51f6 100644 (file)
--- 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 4c2e2f060beb00299ffc7ac53985a8cb44373c3d..d38aec524e8d6811b91378a7aefc38b38dcc1132 100644 (file)
--- 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