From f1de7060762d31e567a277c02b0d8d533fbb4661 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 10 Dec 2019 13:19:40 -0600 Subject: [PATCH] ceph-daemon: fix pod stop - rm -f, not stop, so we don't leave things lingering in 'podman ps -a' output - this also seems to fix/work around a problem where stopping the container leaves the daemon running? Signed-off-by: Sage Weil --- src/ceph-daemon/ceph-daemon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon index 8acf4a258a4..87fa36a05f2 100755 --- a/src/ceph-daemon/ceph-daemon +++ b/src/ceph-daemon/ceph-daemon @@ -829,7 +829,7 @@ def deploy_crash(fsid, uid, gid, config, keyring): '[Service]\n' 'Type=simple\n' 'ExecStart={cmd}\n' - 'ExecStop=-{container_path} stop ceph-{fsid}-crash\n' + 'ExecStop=-{container_path} rm -f ceph-{fsid}-crash\n' 'Restart=always\n' 'RestartSec=10\n' 'StartLimitInterval=10min\n' @@ -869,7 +869,7 @@ EnvironmentFile=-/etc/environment ExecStartPre=-{container_path} rm ceph-{fsid}-%i ExecStartPre=-{install_path} -d -m0770 -o {uid} -g {gid} /var/run/ceph/{fsid} ExecStart=/bin/bash {data_dir}/{fsid}/%i/cmd -ExecStop=-{container_path} stop ceph-{fsid}-%i +ExecStop=-{container_path} rm -f ceph-{fsid}-%i Restart=on-failure RestartSec=10s TimeoutStartSec=120 -- 2.39.5