]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: lifecycle thread shouldn't process the bucket which has been deleted. 16183/head
authorZhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Wed, 14 Jun 2017 02:29:53 +0000 (10:29 +0800)
committerNathan Cutler <ncutler@suse.com>
Thu, 6 Jul 2017 17:47:37 +0000 (19:47 +0200)
Fixes: http://tracker.ceph.com/issues/20285
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit a2b042fe9f7e6503273fa4c2a4c56e399d7c338f)

src/rgw/rgw_lc.cc

index 4821b1888ee39f7d52cb2a9d8247e7a06cc15a22..5f70cff8e3b8ad0235ed54f63c66df6e93b1cb6f 100644 (file)
@@ -362,8 +362,8 @@ int RGWLC::bucket_lc_post(int index, int max_lock_sec, cls_rgw_lc_obj_head& head
       ret = cls_rgw_lc_rm_entry(store->lc_pool_ctx, obj_names[index],  entry);
       if (ret < 0) {
         dout(0) << "RGWLC::bucket_lc_post() failed to remove entry " << obj_names[index] << dendl;
-        goto clean;
       }
+      goto clean;
     } else if (result < 0) {
       entry.second = lc_failed;
     } else {