Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

quincy: mgr/cephadm: allow setting mon crush locations through mon service spec #51217

Merged
merged 7 commits into from May 24, 2023

Conversation

adk3798
Copy link
Contributor

@adk3798 adk3798 commented Apr 25, 2023

backport tracker: https://tracker.ceph.com/issues/59547


backport of #49103
parent tracker: https://tracker.ceph.com/issues/58101

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

Copy link
Contributor

@anthonyeleven anthonyeleven left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docs lgtm

Copy link
Contributor

@phlogistonjohn phlogistonjohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backport lgtm

@adk3798
Copy link
Contributor Author

adk3798 commented May 24, 2023

https://pulpito.ceph.com/adking-2023-05-21_23:26:59-orch:cephadm-wip-adk3-testing-2023-05-21-1607-quincy-distro-default-smithi/

Reruns of failed/dead jobs: https://pulpito.ceph.com/adking-2023-05-22_14:09:29-orch:cephadm-wip-adk3-testing-2023-05-21-1607-quincy-distro-default-smithi/

After reruns, 2 failed, 1 dead job:

  • nfs-ingress test failed zipping logs after the actual test was complete. From what I can tell from the logs the test itself completed successfully
  • test_non_existent_cluster failed in test_nfs test. This is a known issue specifically on quincy
  • upgrade_with_workload timed out on the workload portion post upgrade. Also a known issue

Overall, nothing to block merging

…ns field

In order to allow having cephadm set the crush locations
for the mons. For helping with setting up stretch mode
with a cephadm cluster

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 416da86)
…n in spec

Necessary to do this for stretch mode tiebreaker mon replacement

Fixes: https://tracker.ceph.com/issues/58101

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit ffec371)
Previously, the service config function was only called
when we deploy a new daemon for that service. That meant
that updates to the spec such as changing a cert that don't
affect the daemon placement wouldn't trigger the service level
config to happen again. With this change, we now mark
the service as needing its config function ran if a daemon
for the service is added/removed or if the spec is updated.

Fixes: https://tracker.ceph.com/issues/58100

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 1d50a2c)
The part of this that added the --set-crush-location flag
when deploying the mon was handled in another commit. This
piece is to finish the functionality by having cephadm set
the location through commands to handle when multiple
bucket=loc pairs are specified for a single monitor

Fixes: https://tracker.ceph.com/issues/58101

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 2672a71)
Trying to add a feature where mon crush locations
can be set through the orchestrator using the mon
service spec. This is meant to be a test for that.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 8c52a0a)
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit cd96b70)
…tore

In a normal deployment, we generally shouldn't have
to worry about this. This is more for teuthology
which does deployments in a weird way that can cause
there to be no mon spec in the cluster. Fixes an issue
seen when backporting the mon crush location work
to quincy where an upgrade test would fail with

```
[WRN] UPGRADE_REDEPLOY_DAEMON: Upgrading daemon mon.b on host smithi047 failed.
    Upgrade daemon: mon.b: Service mon not found.
```

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 8aab7be)
@adk3798
Copy link
Contributor Author

adk3798 commented May 24, 2023

force pushed fixed a trivial merge conflict that was done the same way in the build used in the testing mentioned in my previous comment so no extra runs should be needed

@adk3798 adk3798 merged commit 5020066 into ceph:quincy May 24, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants