From: cao.leilc <cao.leilc@inspur.com>
Date: Tue, 13 Dec 2022 06:34:14 +0000 (+0800)
Subject: rgw: fix problem that usage is trimmed when the remove-all parameter of rgw admin... 
X-Git-Tag: v18.1.0~605^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc3c1425bccc7a98dfc3a8d8f56322266d09de37;p=ceph.git

rgw: fix problem that usage is trimmed when the remove-all parameter of rgw admin operation trim usage interface is set false.

Fixes: https://tracker.ceph.com/issues/54254
Signed-off-by: caolei <cao.leilc@inspur.com>
---

diff --git a/src/rgw/rgw_rest_usage.cc b/src/rgw/rgw_rest_usage.cc
index 104dc193884d..9207a68cdf40 100644
--- a/src/rgw/rgw_rest_usage.cc
+++ b/src/rgw/rgw_rest_usage.cc
@@ -94,7 +94,7 @@ void RGWOp_Usage_Delete::execute(optional_yield y) {
   RESTArgs::get_epoch(s, "end", (uint64_t)-1, &end);
 
   if (rgw::sal::User::empty(user.get()) &&
-      !bucket_name.empty() &&
+      bucket_name.empty() &&
       !start &&
       end == (uint64_t)-1) {
     bool remove_all;