]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: check going_down() when lifecycle processing 19088/head
authorYao Zongyou <yaozongyou@vip.qq.com>
Thu, 9 Nov 2017 12:40:15 +0000 (20:40 +0800)
committerPrashant D <pdhange@redhat.com>
Tue, 21 Nov 2017 22:17:42 +0000 (17:17 -0500)
Fixes: http://tracker.ceph.com/issues/22099
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
(cherry picked from commit b761989033ac0722a1504238648a806c8004b8e3)

src/rgw/rgw_lc.cc

index cdcfaffff77cc7345352f5ff09f807e3f0a2755a..00ce467ab93fbcd75ece7548b1b1781613865985 100644 (file)
@@ -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);