pacific: cephadm: allow ports to be opened in firewall during adoption, reconfig, redeploy #52083
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prior to this patch we were discarding the provided ports on reconfig and redeploy in order to not fail thinking there was a port conflict with the instance of the daemon we were about to reconfig/redeploy. However, it's still desirable for us to make sure the firewall ports are open when we do a reconfig/redpeloy, so this refactors the port handling approach to have it do that but still avoid checking for port conflicts. It also include an update of the type signature of deploy_daemon to the py3 style. That wasn't needed for the change but since I was added an arugment there I thought we might as well do it now. Signed-off-by: Adam King <adking@redhat.com> (cherry picked from commit fdecd66) Conflicts: src/cephadm/cephadm src/cephadm/tests/test_cephadm.py
Otherwise we risk the prometheus/alertmanager/grafana not functioning properly after adoption due to the necessary port in the firewall not being open. Fixes: https://tracker.ceph.com/issues/59443 Signed-off-by: Adam King <adking@redhat.com> (cherry picked from commit 40a9817)
Since the options are mutually exclusive, using an enum is preferable to having multiple bools to track each of them Signed-off-by: Adam King <adking@redhat.com> (cherry picked from commit 7081759) Conflicts: src/cephadm/cephadm
rkachach
approved these changes
Jun 20, 2023
phlogistonjohn
approved these changes
Jun 21, 2023
|
reruns of failed jobs: https://pulpito.ceph.com/adking-2023-10-12_22:09:36-orch:cephadm-wip-adk2-testing-2023-10-11-1434-pacific-distro-default-smithi/ reruns of reruns of failed jobs: https://pulpito.ceph.com/adking-2023-10-13_12:25:25-orch:cephadm-wip-adk2-testing-2023-10-11-1434-pacific-distro-default-smithi/ Needed double reruns because we were hitting a combination of and failures. After the second rerun, 3 failures:
Nothing new or that should block merging for the backports in the run. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/61677
backport of #51070
parent tracker: https://tracker.ceph.com/issues/59443
this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh