]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw: fix memory growth while deleteing objects with 31378/head
authorMark Kogan <mkogan@redhat.com>
Thu, 5 Sep 2019 09:32:50 +0000 (12:32 +0300)
committerNathan Cutler <ncutler@suse.com>
Wed, 13 Nov 2019 13:08:29 +0000 (14:08 +0100)
commitc4463f7860de91eb269460aa9831f4601a859b6b
tree5e0dcc7a41224557d71248044fc0721dfabd1b82
parentf5c23c32e7009b679da0813d9d0fc9833d5281d2
rgw: fix memory growth while deleteing objects with
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>
(cherry picked from commit 21560ed2e141137bbcb4d871eb3908d293a83948)

Conflicts:
    src/rgw/rgw_bucket.cc
- in mimic, "invalidate" is a method of "obj_ctx.obj" where in master it's
  a method of the parent class "obj_ctx"
src/rgw/rgw_bucket.cc