From: Mark Kogan <mkogan@redhat.com>
Date: Thu, 5 Sep 2019 09:32:50 +0000 (+0300)
Subject: rgw: fix memory growth while deleteing objects with
X-Git-Tag: v13.2.9~85^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4463f7860de91eb269460aa9831f4601a859b6b;p=ceph.git

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"
---

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index c975dbca101..0c95532f87b 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -725,6 +725,7 @@ int rgw_remove_bucket_bypass_gc(RGWRados *store, rgw_bucket& bucket,
         }
         max_aio = concurrent_max;
       }
+      obj_ctx.obj.invalidate(obj);
     } // for all RGW objects
   }