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

mimic: rbd_mirror: don't report error if image replay canceled #26140

Merged
merged 1 commit into from
May 6, 2019
Merged

mimic: rbd_mirror: don't report error if image replay canceled #26140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/tools/rbd_mirror/ImageReplayer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,9 @@ void ImageReplayer<I>::handle_bootstrap(int r) {
}
}

if (r == -EREMOTEIO) {
if (on_start_interrupted()) {
return;
} else if (r == -EREMOTEIO) {
m_local_image_tag_owner = "";
dout(5) << "remote image is non-primary" << dendl;
on_start_fail(-EREMOTEIO, "remote image is non-primary");
Expand All @@ -535,8 +537,6 @@ void ImageReplayer<I>::handle_bootstrap(int r) {
} else if (r < 0) {
on_start_fail(r, "error bootstrapping replay");
return;
} else if (on_start_interrupted()) {
return;
} else if (m_resync_requested) {
on_start_fail(0, "resync requested");
return;
Expand Down Expand Up @@ -573,12 +573,12 @@ template <typename I>
void ImageReplayer<I>::handle_init_remote_journaler(int r) {
dout(10) << "r=" << r << dendl;

if (r < 0) {
if (on_start_interrupted()) {
return;
} else if (r < 0) {
derr << "failed to initialize remote journal: " << cpp_strerror(r) << dendl;
on_start_fail(r, "error initializing remote journal");
return;
} else if (on_start_interrupted()) {
return;
}

m_remote_journaler->add_listener(&m_remote_listener);
Expand Down