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 #8371 from runsisi/wip-fix-eexist

Browse Source 
cls_rbd: fix -EEXIST checking in cls::rbd::image_set

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-03-31 13:34:26 -05:00
commit 550761b5f6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cls/rbd/cls_rbd.cc
View File

@ -3091,8 +3091,12 @@ int image_set(cls_method_context_t hctx, const string &image_id,
std::string global_id_key = global_key(mirror_image.global_image_id);
std::string image_id;
r = read_key(hctx, global_id_key, &image_id);
if (r != -ENOENT) {
if (r >= 0) {
return -EEXIST;
} else if (r != -ENOENT) {
CLS_ERR("error reading global image id: '%s': '%s'", image_id.c_str(),
cpp_strerror(r).c_str());
return r;
}
} else if (r < 0) {
CLS_ERR("error reading mirrored image '%s': '%s'", image_id.c_str(),