From: xxcs <silonghu@inspur.com>
Date: Fri, 14 Feb 2020 07:50:38 +0000 (+0800)
Subject: rgw: The rgw_bucket overload <operator, need to consider bucket_id
X-Git-Tag: v16.1.0~1207^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee4733eeb1e86e0d49381454fce512b689a7f0cd;p=ceph.git

rgw: The rgw_bucket overload <operator, need to consider bucket_id

Fixes: https://tracker.ceph.com/issues/42614
Signed-off-by: GaryHyg <huygbj@inspur.com>
---

diff --git a/src/rgw/rgw_basic_types.h b/src/rgw/rgw_basic_types.h
index 0ba03bd0e27f..c226b5777482 100644
--- a/src/rgw/rgw_basic_types.h
+++ b/src/rgw/rgw_basic_types.h
@@ -359,19 +359,19 @@ struct rgw_bucket {
   rgw_bucket& operator=(const rgw_bucket&) = default;
 
   bool operator<(const rgw_bucket& b) const {
-    if (name < b.name) {
+    if (tenant < b.tenant) {
       return true;
-    } else if (name > b.name) {
+    } else if (tenant > b.tenant) {
       return false;
     }
 
-    if (bucket_id < b.bucket_id) {
+    if (name < b.name) {
       return true;
-    } else if (bucket_id > b.bucket_id) {
+    } else if (name > b.name) {
       return false;
     }
 
-    return (tenant < b.tenant);
+    return (bucket_id < b.bucket_id);
   }
 
   bool operator==(const rgw_bucket& b) const {