]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: fix memory growth while deleteing objects with
authorMark Kogan <mkogan@redhat.com>
Thu, 5 Sep 2019 09:32:50 +0000 (12:32 +0300)
committerMark Kogan <mkogan@redhat.com>
Thu, 5 Sep 2019 09:55:44 +0000 (12:55 +0300)
radosgw-admin bucket rm --bucket=$BIG_BUCKET --bypass-gc --purge-objects
by freeing <rgw_obj, RGWObjState> map elements allocated at
https://github.com/ceph/ceph/blob/master/src/rgw/rgw_rados.cc#L236
  result = &objs_state[obj];

Fixes: https://tracker.ceph.com/issues/40700
Signed-off-by: Mark Kogan <mkogan@redhat.com>
src/rgw/rgw_bucket.cc

index c7b65fef57832e5b8a23ac02f3252b2afbeb354f..de00b58b8a6e4bf0ebd6de83aa0a00da5ba83488 100644 (file)
@@ -542,6 +542,7 @@ int rgw_remove_bucket_bypass_gc(RGWRadosStore *store, rgw_bucket& bucket,
         }
         max_aio = concurrent_max;
       }
+      obj_ctx.invalidate(obj);
     } // for all RGW objects
   }