RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8790 from dillaman/wip-15630

Browse Source 
rbd-mirror: interrupting image replay startup can cause crash

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Josh Durgin 2016-04-28 14:54:57 -05:00
commit 2abe34cf81
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools/rbd_mirror/ImageReplayer.cc
View File

@ -322,22 +322,9 @@ void ImageReplayer<I>::start_replay() {
return;
}
m_replay_handler = new ReplayHandler<I>(this);
m_remote_journaler->start_live_replay(m_replay_handler,
1 /* TODO: configurable */);
dout(20) << "m_remote_journaler=" << *m_remote_journaler << dendl;
assert(r == 0);
Context *on_finish(nullptr);
{
Mutex::Locker locker(m_lock);
if (m_stop_requested) {
on_start_fail_start(-EINTR);
return;
}
assert(m_state == STATE_STARTING);
m_state = STATE_REPLAYING;
std::swap(m_on_start_finish, on_finish);
@ -348,6 +335,17 @@ void ImageReplayer<I>::start_replay() {
dout(20) << "on finish complete, r=" << r << dendl;
on_finish->complete(r);
}
{
Mutex::Locker locker(m_lock);
m_replay_handler = new ReplayHandler<I>(this);
m_remote_journaler->start_live_replay(m_replay_handler,
1 /* TODO: configurable */);
dout(20) << "m_remote_journaler=" << *m_remote_journaler << dendl;
}
on_replay_interrupted();
}
template <typename I>