RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: return an error when removing a non-existent image

Browse Source 
Try treating the image as new format if it's not in the old-style
directory, which is the last step in old-style removal. Then if the
image is not found in the new-style directory, -ENOENT will be
returned, preserving the semantics that existed prior to
6f096b6cdc.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Josh Durgin 2012-07-09 17:24:19 -07:00
parent 96ca508dcd
commit 67361c10ea
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librbd.cc
View File

@ -1285,15 +1285,14 @@ int remove(IoCtx& io_ctx, const char *imgname, ProgressContext& prog_ctx)
if (old_format || unknown_format) {
ldout(cct, 2) << "removing rbd image from directory..." << dendl;
r = tmap_rm(io_ctx, imgname);
if (r == 0)
old_format = true;
old_format = (r == 0);
if (r < 0 && !unknown_format) {
lderr(cct) << "error removing img from old-style directory: "
<< cpp_strerror(-r) << dendl;
return r;
}
}
if (!old_format || unknown_format) {
if (!old_format) {
ldout(cct, 2) << "removing id object..." << dendl;
r = io_ctx.remove(id_obj_name(imgname));
if (r < 0 && r != -ENOENT) {
@ -1301,17 +1300,15 @@ int remove(IoCtx& io_ctx, const char *imgname, ProgressContext& prog_ctx)
return r;
}
if (unknown_format) {
r = cls_client::dir_get_id(&io_ctx, RBD_DIRECTORY, imgname, &id);
if (r < 0 && r != -ENOENT) {
lderr(cct) << "error getting id of image" << dendl;
return r;
}
r = cls_client::dir_get_id(&io_ctx, RBD_DIRECTORY, imgname, &id);
if (r < 0 && r != -ENOENT) {
lderr(cct) << "error getting id of image" << dendl;
return r;
}
ldout(cct, 2) << "removing rbd image from directory..." << dendl;
r = cls_client::dir_remove_image(&io_ctx, RBD_DIRECTORY, imgname, id);
if (r < 0 && !unknown_format) {
if (r < 0) {
lderr(cct) << "error removing img from new-style directory: "
<< cpp_strerror(-r) << dendl;
return r;