mon, osd: add command to remove invalid pg-upmap-primary entries by ljflores · Pull Request #62190 · ceph/ceph

ljflores · 2025-03-09T23:29:41Z

The current rm-pg-upmap-primary command checks that the pgid exists in the pgmap before continuing to remove it. Due to https://tracker.ceph.com/issues/66867, some invalid pg-upmap-primary entires may exist for pools that have been removed. Currently, these mappings are impossible to remove since the pgids no longer exist in the pgmap.

This new command, rm-pg-upmap-primary-all, allows users the ability to remove any and all pg-upmap-primary mappings in the osdmap at once, which includes valid and invalid entries.

This command may also be helpful when upgrading from versions where users are plagued by https://tracker.ceph.com/issues/61948. Users may use an upgraded mon to remove all pg-upmap-primray entries (valid and invalid) so they continue to upgrade to a safe version.

See manual testing for this patch here: https://tracker.ceph.com/issues/67179#note-12

Fixes: https://tracker.ceph.com/issues/67179
Fixes: https://tracker.ceph.com/issues/69760

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 x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

Checklist

Tracker (select at least one)
- References tracker ticket
- Very recent bug; references commit where it was introduced
- New feature (ticket optional)
- Doc update (no ticket needed)
- Code cleanup (no ticket needed)
Component impact
- Affects Dashboard, opened tracker ticket
- Affects Orchestrator, opened tracker ticket
- No impact that needs to be tracked
Documentation (select at least one)
- Updates relevant documentation
- No doc update is appropriate
Tests (select at least one)
- Includes unit test(s)
- Includes integration test(s)
- Includes bug reproducer
- No tests

Show available Jenkins commands

jenkins test classic perf Jenkins Job | Jenkins Job Definition
jenkins test crimson perf Jenkins Job | Jenkins Job Definition
jenkins test signed Jenkins Job | Jenkins Job Definition
jenkins test make check Jenkins Job | Jenkins Job Definition
jenkins test make check arm64 Jenkins Job | Jenkins Job Definition
jenkins test submodules Jenkins Job | Jenkins Job Definition
jenkins test dashboard Jenkins Job | Jenkins Job Definition
jenkins test dashboard cephadm Jenkins Job | Jenkins Job Definition
jenkins test api Jenkins Job | Jenkins Job Definition
jenkins test docs ReadTheDocs | Github Workflow Definition
jenkins test ceph-volume all Jenkins Jobs | Jenkins Jobs Definition
jenkins test windows Jenkins Job | Jenkins Job Definition
jenkins test rook e2e Jenkins Job | Jenkins Job Definition

rzarzynski

Basically LGTM apart of some nits.
The idea of osd rm-pg-upmap-primary-all looks sane. It satisfies the need an emergency purge in a simple way likely alleviating the demand for --force in the per-PG remove command.

src/mon/OSDMonitor.cc

src/osd/OSDMap.cc

src/mon/OSDMonitor.cc

ljflores · 2025-03-12T21:27:30Z

jenkins test docs

JoshSalomon · 2025-03-16T16:48:18Z

src/mon/OSDMonitor.cc

+	return true;
+      }
+      break;
+    case OP_RM_PG_UPMAP_PRIMARY_ALL: // no pgid to check


very nit ;) - I would put this case as the first one - else it is hard to find it.
I also like to add default: case with an error message or assert just in case someone adds a value in the future and forgets to update all the places

ACK, added. This has already gone into teuthology testing, although the change is so trivial that I will confirm locally that the fix works, then IMO it is okay to merge pending QA approval.

Confirmed locally.

The current rm-pg-upmap-primary command checks that the pgid exists in the pgmap before continuing to remove it. Due to https://tracker.ceph.com/issues/66867, some invalid pg-upmap-primary entires may exist for pools that have been removed. Currently, these mappings are impossible to remove since the pgids no longer exist in the pgmap. This new command, rm-pg-upmap-primary-all, allows users the ability to remove any and all pg-upmap-primary mappings in the osdmap at once, which includes valid and invalid entries. This command may also be helpful when upgrading from versions where users are plagued by https://tracker.ceph.com/issues/61948. Users may use an upgraded mon to remove all pg-upmap-primray entries (valid and invalid) so they continue to upgrade to a safe version. See manual testing for this patch here: https://tracker.ceph.com/issues/67179#note-12 Fixes: https://tracker.ceph.com/issues/67179 Fixes: https://tracker.ceph.com/issues/69760 Signed-off-by: Laura Flores <lflores@ibm.com>

ljflores · 2025-03-17T23:02:22Z

Rados approved: https://tracker.ceph.com/projects/rados/wiki/MAIN#httpstrackercephcomissues70402

…ary-{all}" commands Added a release note for `ceph osd rm-pg-upmap-primary` and documentation to complement ceph#62190. Signed-off-by: Laura Flores <lflores@ibm.com>

…ary-{all}" commands Added a release note for `ceph osd rm-pg-upmap-primary` and documentation to complement ceph#62190. Signed-off-by: Laura Flores <lflores@ibm.com> (cherry picked from commit 4dee791) *Note: PendingReleaseNotes was modified to have the release note under the v19.2.2 section.

…ary-{all}" commands Added a release note for `ceph osd rm-pg-upmap-primary` and documentation to complement ceph#62190. Signed-off-by: Laura Flores <lflores@ibm.com> (cherry picked from commit 4dee791)

…ary-{all}" commands Added a release note for `ceph osd rm-pg-upmap-primary` and documentation to complement ceph#62190. Signed-off-by: Laura Flores <lflores@ibm.com> (cherry picked from commit 4dee791) *Note: PendingReleaseNotes was modified to have the release note under the v19.2.2 section.

…ary-{all}" commands Added a release note for `ceph osd rm-pg-upmap-primary` and documentation to complement ceph#62190. Signed-off-by: Laura Flores <lflores@ibm.com> (cherry picked from commit 4dee791) *Note: PendingReleaseNotes changed to put the release note under v18.2.5.

ljflores requested a review from a team as a code owner March 9, 2025 23:29

github-actions bot added core mon labels Mar 9, 2025

ljflores requested review from JoshSalomon and rzarzynski March 9, 2025 23:30

ljflores mentioned this pull request Mar 9, 2025

reef: mon, osd: add command to remove invalid pg-upmap-primary entries #62191

Merged

14 tasks

rzarzynski approved these changes Mar 10, 2025

View reviewed changes

src/mon/OSDMonitor.cc Show resolved Hide resolved

src/osd/OSDMap.cc Outdated Show resolved Hide resolved

src/osd/OSDMap.cc Outdated Show resolved Hide resolved

src/osd/OSDMap.cc Show resolved Hide resolved

rzarzynski mentioned this pull request Mar 10, 2025

osd, mon: handle pg-upmap-primary corner cases #59331

Closed

14 tasks

ljflores force-pushed the wip-tracker-69760 branch 2 times, most recently from 99c5b4c to ba6cfbc Compare March 10, 2025 21:42

ljflores commented Mar 10, 2025

View reviewed changes

src/mon/OSDMonitor.cc Outdated Show resolved Hide resolved

ljflores force-pushed the wip-tracker-69760 branch from ba6cfbc to 80c5a66 Compare March 10, 2025 22:17

rzarzynski approved these changes Mar 10, 2025

View reviewed changes

rzarzynski added the needs-qa label Mar 10, 2025

yuriw added the wip-yuri7-testing label Mar 11, 2025

JoshSalomon approved these changes Mar 16, 2025

View reviewed changes

ljflores force-pushed the wip-tracker-69760 branch from 80c5a66 to 6e9e203 Compare March 17, 2025 22:26

yuriw merged commit 8d229a9 into ceph:main Mar 18, 2025
11 checks passed

ljflores deleted the wip-tracker-69760 branch March 20, 2025 19:14

This was referenced Mar 20, 2025

squid: mon, osd: add command to remove invalid pg-upmap-primary entries #62421

Merged

PendingReleaseNotes; doc/rados/operations: document "rm-pg-upmap-primary-{all}" commands #62422

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mon, osd: add command to remove invalid pg-upmap-primary entries#62190

mon, osd: add command to remove invalid pg-upmap-primary entries#62190
yuriw merged 1 commit intoceph:mainfrom
ljflores:wip-tracker-69760

ljflores commented Mar 9, 2025 •

edited

Loading

Uh oh!

rzarzynski left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ljflores commented Mar 12, 2025

Uh oh!

JoshSalomon Mar 16, 2025

Uh oh!

ljflores Mar 17, 2025

Uh oh!

ljflores Mar 17, 2025

Uh oh!

ljflores commented Mar 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

ljflores commented Mar 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contribution Guidelines

Checklist

Uh oh!

rzarzynski left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ljflores commented Mar 12, 2025

Uh oh!

JoshSalomon Mar 16, 2025

Choose a reason for hiding this comment

Uh oh!

ljflores Mar 17, 2025

Choose a reason for hiding this comment

Uh oh!

ljflores Mar 17, 2025

Choose a reason for hiding this comment

Uh oh!

ljflores commented Mar 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ljflores commented Mar 9, 2025 •

edited

Loading