]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
cephadm: Support Docker Live Restore 61916/head
authorMichal Nasiadka <mnasiadka@gmail.com>
Wed, 11 Sep 2024 12:26:37 +0000 (14:26 +0200)
committerAdam King <adking@redhat.com>
Wed, 19 Feb 2025 20:41:08 +0000 (15:41 -0500)
commitf721d18189d6ba56679b3f35ffdcab198c7b05cc
tree49f7900c9495f44f67a5fd1f2d11d5b21a5b1a40
parenta33d4403d61d1920174396cfeed5d4a47b73657c
cephadm: Support Docker Live Restore

Currently with Docker Live Restore [1] enabled and while restarting
Docker Engine - all Ceph container images will get restarted,
while the feature allows restarting docker.service without
containers downtime.

This is due to Requires=docker.service in systemd units templates,
which mandates that on docker.service restart - the ceph container
systemd units will be restarted as well.

Reworking Requires= to Wants= that is a weaker version of the former,
see [2].

Leaving After= entries, because they should allow systemd to correctly
order the startup (first docker, then ceph containers).

[1]: https://docs.docker.com/engine/daemon/live-restore/
[2]: https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#Wants=

Fixes: https://tracker.ceph.com/issues/68028
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
(cherry picked from commit e0f77686523337f37e3ddbbe40eaa92c68947195)

Conflicts:
src/cephadm/cephadmlib/templates/ceph.service.j2
src/cephadm/cephadmlib/templates/init_ctr.service.j2
src/cephadm/cephadmlib/templates/sidecar.service.j2
src/cephadm/tests/test_unit_file.py
doc/cephadm/install.rst
src/cephadm/cephadm.py
src/cephadm/tests/test_cephadm.py