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

osd/PG: ignore CancelRecovery in NotRecovering #16638

Merged
merged 1 commit into from Jul 28, 2017

Conversation

Projects
None yet
2 participants
@liewegas
Member

liewegas commented Jul 27, 2017

It's possible to get >1 CancelRecovery events in the queue.
The first will transition us from Recovering to NotRecovering.
Currently the second will make us crash.

This is harmless; instead just swallow the event.

Fixes: http://tracker.ceph.com/issues/20804
Signed-off-by: Sage Weil sage@redhat.com

osd/PG: ignore CancelRecovery in NotRecovering
It's possible to get >1 CancelRecovery events in the queue.
The first will transition us from Recovering to NotRecovering.
Currently the second will make us crash.

This is harmless; instead just swallow the event.

Fixes: http://tracker.ceph.com/issues/20804
Signed-off-by: Sage Weil <sage@redhat.com>

@liewegas liewegas requested a review from jdurgin Jul 27, 2017

@liewegas liewegas added this to the luminous milestone Jul 27, 2017

@gregsfortytwo

It would be a little safer to build state into CancelRecovery and write discard logic for out-of-date events, but this is a LOT simpler. LGTM.

@liewegas liewegas merged commit f4850ae into ceph:master Jul 28, 2017

3 of 5 checks passed

ceph-volume tox testing ceph-volume tox failed
Details
make check (arm64) make check failed
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

@liewegas liewegas deleted the liewegas:wip-20804 branch Jul 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment