OSDMonitor: exclude destroyed OSDs from "ceph node ls" output#62243
Merged
NitzanMordhai merged 1 commit intoceph:mainfrom Mar 16, 2025
Merged
Conversation
After destroying an OSD, the command "ceph node ls" still listed the destroyed OSD, causing confusion. This fix ensures that the status of the OSD is checked before adding it to the output, aligning its behavior with "ceph osd tree," which already displays the correct status. Fixes: https://tracker.ceph.com/issues/70400 Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
rzarzynski
approved these changes
Mar 12, 2025
Contributor
rzarzynski
left a comment
There was a problem hiding this comment.
LGTM! Requires teuthology testing + baking to ensure interactions with the users of node ls.
| } | ||
| if (osdmap.is_destroyed(osd)) { | ||
| continue; | ||
| } |
Contributor
There was a problem hiding this comment.
I guess other monitors (like MgrMonitor) can exhibit similar problem.
Contributor
|
jenkins test make check |
Contributor
|
jenkins test make check arm64 |
Contributor
Author
|
jenkins test make check |
Contributor
Author
|
jenkins test make check arm64 |
Contributor
Author
Contributor
Author
|
jenkins test make check arm64 |
This was referenced Mar 16, 2025
Contributor
|
For the record, this one fixed the issue where destroyed OSDs waiting to be replaced were incorrectly appearing as stray daemons in Ceph status #67018. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
After destroying an OSD, the command "ceph node ls" still listed the destroyed OSD, causing confusion. This fix ensures that the status of the OSD is checked before adding it to the output, aligning its behavior with "ceph osd tree," which already displays the correct status.
Fixes: https://tracker.ceph.com/issues/70400
Contribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an
xbetween the brackets:[x]. Spaces and capitalization matter when checking off items this way.Checklist
Show available Jenkins commands
jenkins test classic perfJenkins Job | Jenkins Job Definitionjenkins test crimson perfJenkins Job | Jenkins Job Definitionjenkins test signedJenkins Job | Jenkins Job Definitionjenkins test make checkJenkins Job | Jenkins Job Definitionjenkins test make check arm64Jenkins Job | Jenkins Job Definitionjenkins test submodulesJenkins Job | Jenkins Job Definitionjenkins test dashboardJenkins Job | Jenkins Job Definitionjenkins test dashboard cephadmJenkins Job | Jenkins Job Definitionjenkins test apiJenkins Job | Jenkins Job Definitionjenkins test docsReadTheDocs | Github Workflow Definitionjenkins test ceph-volume allJenkins Jobs | Jenkins Jobs Definitionjenkins test windowsJenkins Job | Jenkins Job Definitionjenkins test rook e2eJenkins Job | Jenkins Job Definition