systemd: Use the same restart limits as upstart

Currently, the systemd daemons are not restarted on failure. This patch
adds this functionality and sets the defaults to those defined in
upstart. This resolves to 3 fails per 30 minutes for osd, mon and mds
and 5 fails per 30 seconds for radosgw.

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/systemd/ceph-mds@.service b/systemd/ceph-mds@.service
index f13cef4428e76a7192450d00927c13e848189492..ae1c29d68ebc36a4ca3529de18bc746f37c643e6 100644 (file)
--- a/systemd/ceph-mds@.service
+++ b/systemd/ceph-mds@.service
@@ -16,6 +16,9 @@ ProtectHome=true
 ProtectSystem=full
 PrivateTmp=true
 TasksMax=infinity
+Restart=on-failure
+StartLimitInterval=30min
+StartLimitBurst=3
 
 [Install]
 WantedBy=ceph-mds.target

diff --git a/systemd/ceph-mon@.service b/systemd/ceph-mon@.service
index b9501d630dcfbd64edc0afb77a2e58cc8b439a89..d62c4fd01936b1050c327b7a3ab927418422b1c5 100644 (file)
--- a/systemd/ceph-mon@.service
+++ b/systemd/ceph-mon@.service
@@ -22,6 +22,9 @@ ProtectHome=true
 ProtectSystem=full
 PrivateTmp=true
 TasksMax=infinity
+Restart=on-failure
+StartLimitInterval=30min
+StartLimitBurst=3
 
 [Install]
 WantedBy=ceph-mon.target

diff --git a/systemd/ceph-osd@.service b/systemd/ceph-osd@.service
index 1778db704e8785941f7f69dd205d69ad8fd9543e..df1893eb195522efe49e846027d43d0eeaa88a6b 100644 (file)
--- a/systemd/ceph-osd@.service
+++ b/systemd/ceph-osd@.service
@@ -16,6 +16,9 @@ ProtectHome=true
 ProtectSystem=full
 PrivateTmp=true
 TasksMax=infinity
+Restart=on-failure
+StartLimitInterval=30min
+StartLimitBurst=3
 
 [Install]
 WantedBy=ceph-osd.target

diff --git a/systemd/ceph-radosgw@.service b/systemd/ceph-radosgw@.service
index cfa5788477047c536439cbf53302e27e957a3ce2..e19ba1648c14ab156618bb54ff579fce4b4db580 100644 (file)
--- a/systemd/ceph-radosgw@.service
+++ b/systemd/ceph-radosgw@.service
@@ -15,6 +15,9 @@ ProtectHome=true
 ProtectSystem=full
 PrivateTmp=true
 TasksMax=infinity
+Restart=on-failure
+StartLimitInterval=30s
+StartLimitBurst=5
 
 [Install]
 WantedBy=ceph-radosgw.target