From 83877f7c81f83d8bdfd64a5ebae28ba347d36949 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Thu, 6 Apr 2023 11:38:02 -0400 Subject: [PATCH] rgw/rados: check_quota() uses real bucket owner Fixes: https://tracker.ceph.com/issues/58725 Signed-off-by: Mykola Golub Signed-off-by: Casey Bodley (cherry picked from commit 13299bccc6ae42579a9def4776270abd334e9efe) Conflicts: src/rgw/driver/rados/rgw_sal_rados.cc (changed file location and check_quota signature) --- src/rgw/rgw_sal_rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_sal_rados.cc b/src/rgw/rgw_sal_rados.cc index 9a6c473b93ab..b300e080826d 100644 --- a/src/rgw/rgw_sal_rados.cc +++ b/src/rgw/rgw_sal_rados.cc @@ -317,7 +317,7 @@ int RGWRadosBucket::check_empty(const DoutPrefixProvider *dpp, optional_yield y) int RGWRadosBucket::check_quota(RGWQuotaInfo& user_quota, RGWQuotaInfo& bucket_quota, uint64_t obj_size, optional_yield y, bool check_size_only) { - return store->getRados()->check_quota(owner->get_user(), get_key(), + return store->getRados()->check_quota(info.owner, get_key(), user_quota, bucket_quota, obj_size, y, check_size_only); } -- 2.47.3