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: rollforward may need to mark pglog dirty #31035

Merged
merged 2 commits into from Nov 4, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Oct 21, 2019

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


backport of #28621
parent tracker: https://tracker.ceph.com/issues/40403

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

@smithfarm smithfarm added this to the mimic milestone Oct 21, 2019
@smithfarm smithfarm added the core label Oct 21, 2019
@smithfarm smithfarm requested review from athanatos and neha-ojha Oct 21, 2019
Zengran Zhang added 2 commits Mar 17, 2019
if we rollforward at the end of PG::activate(), we may advance the *crt*,
but we did not mart the log dirty, this means we will not update the crt
within the transaction of rollforward, so it is inconsistent.

Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit 10d0990)

Conflicts:
	src/osd/PGLog.h
- dfbe5e0 is not being backported
- retain !touched_log as part of conditional in is_dirty()
refers: https://github.com/ceph/ceph/pull/27015/files#r294114392

Fixes: http://tracker.ceph.com/issues/40403

Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit 35cb184)
@smithfarm smithfarm force-pushed the smithfarm:wip-40503-mimic branch from 646c085 to 3fcd85e Oct 22, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 22, 2019

jenkins test docs

@smithfarm smithfarm changed the title mimic: osd: accident of rollforward may need to mark pglog dirty mimic: core: osd: rollforward may need to mark pglog dirty Oct 22, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 22, 2019

test this please

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 22, 2019

jenkins test docs

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 31, 2019

@yuriw yuriw merged commit a77d948 into ceph:mimic Nov 4, 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 deleted the smithfarm:wip-40503-mimic branch Nov 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.