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: osd/PGLog: preserve original_crt to check rollbackability #27629

Merged
merged 3 commits into from May 1, 2019

Conversation

Projects
None yet
5 participants
@pdvian
Copy link

commented Apr 17, 2019

neha-ojha added some commits Feb 6, 2019

osd/PGLog: should not rollback further than deleted object version
When a deleted object becomes a divergent entry in the pg log,
we should not be able to rollback to a version of the deleted
object that doesn't exist.

To avoid this, we need to preserve the original crt of the pg log,
before we update it in rewind_from_head() and use that to decide whether
we can rollback or not in _merge_object_divergent_entries().

Fixes: http://tracker.ceph.com/issues/36739
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit de18c59)

Conflicts:
	src/osd/PGLog.h : Resolved in struct PGLog
osd/PGLog: preserve original_crt in proc_replica_log()
This is to prevent rolling back further than deleted object version.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit cd25c1d)
osd/PGLog: preserve original_crt in merge_log()
Fixes: https://tracker.ceph.com/issues/21174
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 47215a5)

@smithfarm smithfarm added this to the mimic milestone Apr 17, 2019

@smithfarm smithfarm added the core label Apr 17, 2019

@smithfarm smithfarm requested review from athanatos and neha-ojha Apr 17, 2019

@neha-ojha

This comment has been minimized.

Copy link
Member

commented Apr 17, 2019

retest this please

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Apr 23, 2019

jenkins re-test this please

@yuriw

This comment has been minimized.

Copy link
Contributor

commented Apr 29, 2019

@yuriw yuriw merged commit 3da4164 into ceph:mimic May 1, 2019

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.