Skip to content

Commit

Permalink
rbd: remove canceled tasks from timer thread
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Douglas Fuller committed Jan 22, 2016
1 parent 45a234d commit 2aa0f31
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/librbd/TaskFinisher.h
Expand Up @@ -45,6 +45,7 @@ class TaskFinisher {
typename TaskContexts::iterator it = m_task_contexts.find(task);
if (it != m_task_contexts.end()) {
delete it->second.first;
m_safe_timer->cancel_event(it->second.second);
m_task_contexts.erase(it);
}
}
Expand Down

0 comments on commit 2aa0f31

Please sign in to comment.