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: merge replica log on primary need according to replica log's crt #30916

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/41457


backport of #29590
parent tracker: https://tracker.ceph.com/issues/41194

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

Fixes: https://tracker.ceph.com/issues/41194

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

Conflicts:
	src/osd/PGLog.h
- ceph_assert
@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 neha-ojha and tchaikov Oct 14, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 18, 2019

jenkins test docs

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 18, 2019

@yuriw yuriw merged commit 3cde91c 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 deleted the smithfarm:wip-41457-mimic branch Oct 22, 2019
@smithfarm smithfarm changed the title mimic: osd: merge replica log on primary need according to replica log's crt mimic: core: osd: merge replica log on primary need according to replica log's crt 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.