]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: nfs migration: avoid port conflicts 44631/head
authorSebastian Wagner <sewagner@redhat.com>
Thu, 6 Jan 2022 11:35:38 +0000 (12:35 +0100)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 18 Jan 2022 11:02:31 +0000 (12:02 +0100)
commit5051e0cb7e26d180c5c2d07d5b7b843769cc7738
tree04c68f4cd8ee65abbf25aac301a23ecf86d759e0
parentaae0c4a4f1209fdd149d16c544252004eae8d535
mgr/cephadm: nfs migration: avoid port conflicts

The nfs upgrade renames the nfs spec from `nfs.ganesha-{service_id}`
to `nfs.{service_id}`. Previously we used the orphan-daemon check
to remove the old `nfs.ganesha-{service_id}` daemons. This does not work
as sometimes serve() tries to deploy the new daemons before cleaning up the
old daemons. This results in a port conflict breaking the upgrade.

Fixes: https://tracker.ceph.com/issues/53424
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit d2cbf9153f02b67d18e168adaeb65940859cc75a)
src/pybind/mgr/cephadm/migrations.py