upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)

It may take tens of seconds to restart each time, so 5 in 30s does not stop
the crash on startup respawn loop in many cases.  In particular, we'd like
to catch the case where the internal heartbeats fail.

This should be enough for all but the most sluggish of OSDs and capture
many cases of failure shortly after startup.

Fixes: #11798
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit eaff6cb24ef052c54dfa2131811758e335f19939)

diff --git a/src/upstart/ceph-mds.conf b/src/upstart/ceph-mds.conf
index 77841cdccd736b9b34bf8eed10ad38d68281c714..4063d9116ebce4c30bd976812e404d8081892018 100644 (file)
--- a/src/upstart/ceph-mds.conf
+++ b/src/upstart/ceph-mds.conf
@@ -4,7 +4,7 @@ start on ceph-mds
 stop on runlevel [!2345] or stopping ceph-mds-all
 
 respawn
-respawn limit 5 30
+respawn limit 3 1800
 
 limit nofile 16384 16384
 

diff --git a/src/upstart/ceph-mon.conf b/src/upstart/ceph-mon.conf
index 0279f15c5a8bf8e528d4908075bec70500ce3947..83c98583c5d69dd186aec3ca5c088e7140c0e616 100644 (file)
--- a/src/upstart/ceph-mon.conf
+++ b/src/upstart/ceph-mon.conf
@@ -4,7 +4,7 @@ start on ceph-mon
 stop on runlevel [!2345] or stopping ceph-mon-all
 
 respawn
-respawn limit 5 30
+respawn limit 3 1800
 
 limit nofile 16384 16384
 

diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index d0205eec6bfa5a784e75dd6ba0ce19b8bfa8091f..2438c206f292bc729c15dbe73797090e8d4a568d 100644 (file)
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -4,7 +4,7 @@ start on ceph-osd
 stop on runlevel [!2345] or stopping ceph-osd-all
 
 respawn
-respawn limit 5 30
+respawn limit 3 1800
 
 limit nofile 327680 327680