From: Yao Zongyou <yaozongyou@vip.qq.com>
Date: Thu, 9 Nov 2017 12:40:15 +0000 (+0800)
Subject: rgw: check going_down() when lifecycle processing
X-Git-Tag: v12.2.3~131^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=14434beda69510108a37ae14d8d5318c93d78da4;p=ceph.git

rgw: check going_down() when lifecycle processing

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

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
(cherry picked from commit b761989033ac0722a1504238648a806c8004b8e3)
---

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index cdcfaffff77c..00ce467ab93f 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -311,6 +311,8 @@ int RGWLC::handle_multipart_expiration(RGWRados::Bucket *target, const map<strin
             ldout(cct, 0) << "ERROR: abort_multipart_upload failed, ret=" << ret <<dendl;
             return ret;
           }
+          if (going_down())
+            return 0;
         }
       }
     } while(is_truncated);
@@ -414,6 +416,9 @@ int RGWLC::bucket_lc_process(string& shard_id)
             } else {
               ldout(cct, 10) << "DELETED:" << bucket_name << ":" << key << dendl;
             }
+
+            if (going_down())
+              return 0;
           }
         }
       } while (is_truncated);
@@ -517,6 +522,9 @@ int RGWLC::bucket_lc_process(string& shard_id)
             } else {
               ldout(cct, 10) << "DELETED:" << bucket_name << ":" << obj_iter->key << dendl;
             }
+
+            if (going_down())
+              return 0;
           }
         }
       } while (is_truncated);