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

mimic: core: osd/OSDMap: do not trust partially simplified pg_upmap_item #30898

Merged
merged 1 commit into from Oct 21, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Oct 14, 2019

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

NOTE: fixes a bug introduced into mimic by 701b78f


backport of #30576
parent tracker: https://tracker.ceph.com/issues/42052

this backport was staged using ceph-backport.sh version 15.0.0.6113
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

If we simplified a partially no-op pg_upmap_item, we shall still
continue to verify that the remaining part is valid.
The bug is introduced by 02e5499,
before which we always validate the correctness of a pg_upmap_item
before trying to cancel or simplify it.

Fixes: https://tracker.ceph.com/issues/42052
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 4196b13)
@smithfarm smithfarm added this to the mimic milestone Oct 14, 2019
@smithfarm smithfarm added the core label Oct 14, 2019
@smithfarm smithfarm requested review from xiexingguo and liewegas Oct 14, 2019
@smithfarm smithfarm added the DNM label Oct 14, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 14, 2019

setting DNM wrt #30576 (comment)

NOTE: this fixes a bug introduced into mimic by 701b78f

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 17, 2019

@yuriw yuriw merged commit 982284c into ceph:mimic Oct 21, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm changed the title mimic: osd/OSDMap: do not trust partially simplified pg_upmap_item mimic: core: osd/OSDMap: do not trust partially simplified pg_upmap_item Oct 22, 2019
@smithfarm smithfarm deleted the smithfarm:wip-42128-mimic branch Oct 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.