]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rados_sync: tolerate ENOENT when deleting an object.
authorGreg Farnum <gregory.farnum@dreamhost.com>
Wed, 11 May 2011 17:39:31 +0000 (10:39 -0700)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Wed, 11 May 2011 18:37:30 +0000 (11:37 -0700)
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
src/rados_sync.cc

index 0c8d3ca56054f92dc98addc95944a56d26032da2..6d0261b5477ac6ab2e54fb6eae61af710ee36316 100644 (file)
@@ -927,7 +927,7 @@ static int do_import(IoCtx& io_ctx, const char *dir_name,
       ret = BackedUpObject::from_path(obj_path.c_str(), lobj);
       if (ret == ENOENT) {
        ret = io_ctx.remove(rados_name);
-       if (ret) {
+       if (ret && ret != -ENOENT) {
          cerr << ERR_PREFIX << "io_ctx.remove(" << obj_path << ") failed "
               << "with error " << ret << std::endl;
          return ret;