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: v13.0.1~251^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18846%2Fhead;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>
---

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index 0e99b1dc25ee..05f993ef7b5b 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -318,6 +318,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);
@@ -457,6 +459,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);
@@ -559,6 +564,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);