mon: Remove any pg_upmap_primary mapping during remove a pool#58470
mon: Remove any pg_upmap_primary mapping during remove a pool#58470
Conversation
|
jenkins test make check |
| << dendl; | ||
| pending_inc.old_pg_upmap_primary.insert(p.first); | ||
| } | ||
| } |
There was a problem hiding this comment.
Thanks for this @mohit84! Can you also include removal of pending_inc.new_pg_upmap_primary? Similar to the above section which removes new_pg_upmap_items.
|
jenkins test make check |
|
Will review this soon.. |
| << " removing obsolete and pending pg_upmap_primaries " << p.first | ||
| << dendl; | ||
| pending_inc.old_pg_upmap_primary.insert(p.first); | ||
| pending_inc.new_pg_upmap_primary.erase(p.first); |
There was a problem hiding this comment.
No - this is incorrect - look above. You should have one loop over pg_upmap_primaries with the code old_pg_upmap_primary.insert() (this code exists) - but you should remove line 14369 and replace it with a loop over new_pg_upmap_primary (there will be different entries there. Basically, you should duplicate the loop between lines 14619 and 14631 using the newer iteration syntax.
There was a problem hiding this comment.
Thanks for reviewing the patch, done !!
JoshSalomon
left a comment
There was a problem hiding this comment.
Line 14639 should be replaced with a loop similar to the loop between lines 14619 and 14631
|
jenkins test make check |
src/mon/OSDMonitor.cc
Outdated
| } | ||
| } | ||
|
|
||
| // remove any new pg_upmap_primary mapping for this pool |
There was a problem hiding this comment.
I would change the comment to "remove any pending pg_upmap_primary ..."
JoshSalomon
left a comment
There was a problem hiding this comment.
One small comment issue
|
jenkins test make check |
ljflores
left a comment
There was a problem hiding this comment.
Nit: Can you change the commit title to mon instead of osdmon?
done |
|
jenkins test api |
|
jenkins test windows |
The pg_upmap_primary items are not deleted after the pool is deleted from the cluster. Fixes: https://tracker.ceph.com/issues/66867 Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
I noticed a compilation error, so I fixed it. @mohit84 Hope you don't mind that I pushed to your branch- I would like to include this in the next squid RC, so it had to be fixed quickly. I verified that the fix works as expected. |
|
Created the squid backport to test in parallel. |
Of course i don't mind it. |
The pg_upmap_primary items are not deleted after the pool is deleted from the cluster.
Fixes: https://tracker.ceph.com/issues/66867
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 retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume toxjenkins test windowsjenkins test rook e2e