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

Merge pull request #9724 from vumrao/wip-vumrao-16130

Browse Source 
rbd: cleanup - Proxied operations shouldn't result in error messages if replayed

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-07-24 11:13:44 -04:00 committed by GitHub
commit b0029b3d3d
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librbd/operation/RenameRequest.cc
View File

@ -66,7 +66,11 @@ bool RenameRequest<I>::should_complete(int r) {
<< "r=" << r << dendl;
r = filter_state_return_code(r);
if (r < 0) {
lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
if (r == -EEXIST) {
ldout(cct, 1) << "image already exists" << dendl;
} else {
lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
}
return true;
}

6
src/librbd/operation/SnapshotProtectRequest.cc
View File

@ -47,7 +47,11 @@ bool SnapshotProtectRequest<I>::should_complete(int r) {
ldout(cct, 5) << this << " " << __func__ << ": state=" << m_state << ", "
<< "r=" << r << dendl;
if (r < 0) {
lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
if (r == -EBUSY) {
ldout(cct, 1) << "snapshot is already protected" << dendl;
} else {
lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
}
}
return true;
}

6
src/librbd/operation/SnapshotRemoveRequest.cc
View File

@ -135,7 +135,11 @@ void SnapshotRemoveRequest<I>::send_remove_child() {
parent_spec our_pspec;
int r = image_ctx.get_parent_spec(m_snap_id, &our_pspec);
if (r < 0) {
lderr(cct) << "failed to retrieve parent spec" << dendl;
if (r == -ENOENT) {
ldout(cct, 1) << "No such snapshot" << dendl;
} else {
lderr(cct) << "failed to retrieve parent spec" << dendl;
}
m_state = STATE_ERROR;
this->async_complete(r);

6
src/librbd/operation/SnapshotRenameRequest.cc
View File

@ -64,7 +64,11 @@ bool SnapshotRenameRequest<I>::should_complete(int r) {
ldout(cct, 5) << this << " " << __func__ << ": state=" << m_state << ", "
<< "r=" << r << dendl;
if (r < 0) {
lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
if (r == -EEXIST) {
ldout(cct, 1) << "snapshot already exists" << dendl;
} else {
lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
}
}
return true;
}

6
src/librbd/operation/SnapshotUnprotectRequest.cc
View File

@ -169,7 +169,11 @@ bool SnapshotUnprotectRequest<I>::should_complete(int r) {
ldout(cct, 5) << this << " " << __func__ << ": state=" << m_state << ", "
<< "r=" << r << dendl;
if (r < 0) {
lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
if (r == -EINVAL) {
ldout(cct, 1) << "snapshot is already unprotected" << dendl;
} else {
lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
}
if (m_ret_val == 0) {
m_ret_val = r;
}