From: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Wed, 14 Jun 2017 02:29:53 +0000 (+0800)
Subject: rgw: lifecycle thread shouldn't process the bucket which has been deleted.
X-Git-Tag: v12.1.0~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2b042fe9f7e6503273fa4c2a4c56e399d7c338f;p=ceph.git

rgw: lifecycle thread shouldn't process the bucket which has been deleted.

Fixes: http://tracker.ceph.com/issues/20285

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index 1b7ce3c572e2..ac1792c9e71c 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -505,8 +505,8 @@ int RGWLC::bucket_lc_post(int index, int max_lock_sec, pair<string, int >& entry
       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 {