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 #19618 from dillaman/wip-18435

Browse Source 
librbd: filter out potential race with image rename

Reviewed-by: Mykola Golub <mgolub@suse.com>
This commit is contained in:
Mykola Golub 2017-12-24 20:13:30 +02:00 committed by GitHub
commit 9c254f963a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,8 +74,10 @@ bool RenameRequest<I>::should_complete(int r) {
return true;
}
if (m_state == STATE_REMOVE_SOURCE_HEADER) {
if (m_state == STATE_UPDATE_DIRECTORY) {
// update in-memory name before removing source header
apply();
} else if (m_state == STATE_REMOVE_SOURCE_HEADER) {
return true;
}
@ -102,7 +104,13 @@ int RenameRequest<I>::filter_state_return_code(int r) {
I &image_ctx = this->m_image_ctx;
CephContext *cct = image_ctx.cct;
if (m_state == STATE_REMOVE_SOURCE_HEADER && r < 0) {
if (m_state == STATE_READ_SOURCE_HEADER && r == -ENOENT) {
RWLock::RLocker snap_locker(image_ctx.snap_lock);
if (image_ctx.name == m_dest_name) {
// signal that replay raced with itself
return -EEXIST;
}
} else if (m_state == STATE_REMOVE_SOURCE_HEADER && r < 0) {
if (r != -ENOENT) {
lderr(cct) << "warning: couldn't remove old source object ("
<< m_source_oid << ")" << dendl;