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.

Sign up for GitHub

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

Jump to bottom

luminous: scrub errors not cleared on replicas can cause inconsistent pg state when replica takes over primary #21103

Merged
merged 3 commits into from Apr 11, 2018
Merged

luminous: scrub errors not cleared on replicas can cause inconsistent pg state when replica takes over primary #21103

merged 3 commits into from Apr 11, 2018

Conversation

dzafman
Copy link
Contributor

@dzafman dzafman commented Mar 28, 2018 •
edited by smithfarm

@dzafman dzafman added this to the luminous milestone Mar 28, 2018
@dzafman dzafman requested a review from jdurgin March 28, 2018 21:46
@dzafman dzafman changed the title luminous: scrub errors not cleared on replicas can cause inconsistent pg state when replica takes over primary DNM: luminous: scrub errors not cleared on replicas can cause inconsistent pg state when replica takes over primary Mar 28, 2018
@dzafman
Copy link
Contributor Author

dzafman commented Mar 28, 2018

Can't merge until #21101

@dzafman dzafman force-pushed the wip-23267-luminous branch 3 times, most recently from f4fa215 to 7fb0308 Compare April 3, 2018 19:45
@dzafman dzafman added the DNM label Apr 3, 2018
@dzafman dzafman changed the title DNM: luminous: scrub errors not cleared on replicas can cause inconsistent pg state when replica takes over primary luminous: scrub errors not cleared on replicas can cause inconsistent pg state when replica takes over primary Apr 3, 2018
@dzafman
osd: Improve object_stat_sum_t handling
53e6d18 
Keep post split PGs as inconsistent from original
Keep num_scrub_errors as total of other 2

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 39adde2)

Conflicts:
	src/osd/osd_types.h (trivial)
@dzafman
test: Eliminate use of bc (use awk) in get_timeout_delays()
da4f397 
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ce9c029)
@dzafman
osd: Fix stale scrub stats when a primary takes over
5a42347 
Fixes: http://tracker.ceph.com/issues/23267

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 5cfb824)
@dzafman
Copy link
Contributor Author

dzafman commented Apr 11, 2018

Testing passed:

http://pulpito.ceph.com/dzafman-2018-04-10_21:48:51-rados:standalone-wip-23267-luminous-distro-basic-smithi/

@dzafman dzafman removed the DNM label Apr 11, 2018
@dzafman dzafman merged commit 7dcf9cf into ceph:luminous Apr 11, 2018
@dzafman dzafman deleted the wip-23267-luminous branch April 11, 2018 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdurgin jdurgin jdurgin approved these changes

Assignees
No one assigned
Labels
bug-fix core needs-review
Projects
None yet
Milestone
luminous
2 participants
@dzafman @jdurgin