From 447fd75acba8825df04f24bf38689593cab50483 Mon Sep 17 00:00:00 2001 From: Daniel Swarbrick Date: Fri, 13 Feb 2026 16:45:45 +0100 Subject: [PATCH] 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 (cherry picked from commit 792d5d2f01833425c00e00c2e943117466589901) --- roles/ceph-osd/templates/ceph-osd.service.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2 index de4dd9e11..2556ec402 100644 --- 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 -- 2.47.3