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

infernalis: rbd: TaskFinisher::cancel should remove event from SafeTimer #7426

Merged
1 commit merged into from Feb 8, 2016

Conversation

Abhishekvrshny
Copy link

When canceling scheduled tasks using the timer thread, TaskFinisher::cancel
does not call SafeTimer::cancel_event, so events fire anyway. Add this call.

Fixes: ceph#14476
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit 2aa0f31)
@Abhishekvrshny Abhishekvrshny added this to the infernalis milestone Jan 29, 2016
@Abhishekvrshny Abhishekvrshny self-assigned this Jan 29, 2016
ghost pushed a commit that referenced this pull request Feb 8, 2016
…d remove event from SafeTimer

Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ghost ghost assigned dillaman and unassigned Abhishekvrshny Feb 8, 2016
@ghost
Copy link

ghost commented Feb 8, 2016

@dillaman does this backport look good to merge ? It passed a run of the infernalis rbd suite ( see http://tracker.ceph.com/issues/13750#note-18 for details ). Note that all valgrind tests in this suite fail because of an environmental problem ( http://tracker.ceph.com/issues/14664 ).

@dillaman
Copy link

dillaman commented Feb 8, 2016

lgtm

ghost pushed a commit that referenced this pull request Feb 8, 2016
infernalis: rbd: TaskFinisher::cancel should remove event from SafeTimer

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
@ghost ghost merged commit 2de6016 into ceph:infernalis Feb 8, 2016
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants