Increase stop timeout in ceph-osd.service

Wait a bit longer for clean BlueFS umount to prevent unclean shutdowns
resulting in full recovery upon next boot.

Signed-off-by: Daniel Swarbrick <daniel.swarbrick1@ionos.com>
(cherry picked from commit 792d5d2f01833425c00e00c2e943117466589901)

diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2
index de4dd9e11c4b7f0e4fa829e9c8972bd6e05ead3e..2556ec402afd3dd43ae8196431610bba3b4cc9fb 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd.service.j2
+++ b/roles/ceph-osd/templates/ceph-osd.service.j2
@@ -26,13 +26,13 @@ ExecStart=/bin/bash /var/lib/ceph/osd/{{ cluster }}-%i/run %t %n
 {% if container_binary == 'podman' %}
 ExecStop=-/usr/bin/sh -c "/usr/bin/{{ container_binary }} rm -f `cat /%t/%n-cid`"
 {% else %}
-ExecStop=-/usr/bin/{{ container_binary }} stop ceph-osd-%i
+ExecStop=-/usr/bin/{{ container_binary }} stop --timeout 120 ceph-osd-%i
 {% endif %}
 KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120
-TimeoutStopSec=15
+TimeoutStopSec=120
 {% if container_binary == 'podman' %}
 Type=forking
 PIDFile=/%t/%n-pid