From: Casey Bodley Date: Fri, 22 Sep 2023 19:27:38 +0000 (-0400) Subject: rgw: s3website doesn't prefetch for web_dir() check X-Git-Tag: v16.2.15~123^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67f2346d1888b79a994591f9b22ee212041d6e13;p=ceph.git rgw: s3website doesn't prefetch for web_dir() check this function only needs to check for existence of the given path. the sal::Object is destroyed before the function returns, so it's wasteful to prefetch its data Fixes: https://tracker.ceph.com/issues/62938 Signed-off-by: Casey Bodley (cherry picked from commit 7ba05a29163e1a81fb449e3231200e0bf55c1200) Conflicts: src/rgw/rgw_rest_s3.cc set_prefetch_data() is a member of RGWObjectCtx --- diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index fe45f6c71d77..2e13730c942b 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -4942,7 +4942,6 @@ bool RGWHandler_REST_S3Website::web_dir() const { RGWObjectCtx& obj_ctx = *static_cast(s->obj_ctx); obj_ctx.set_atomic(obj); - obj_ctx.set_prefetch_data(obj); RGWObjState* state = nullptr; if (store->getRados()->get_obj_state(s, &obj_ctx, s->bucket->get_info(), obj, &state, false, s->yield) < 0) {