]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: The rgw_bucket overload <operator, need to consider bucket_id 31354/head
authorxxcs <silonghu@inspur.com>
Fri, 14 Feb 2020 07:50:38 +0000 (15:50 +0800)
committerxxcs <silonghu@inspur.com>
Fri, 14 Feb 2020 07:50:38 +0000 (15:50 +0800)
Fixes: https://tracker.ceph.com/issues/42614
Signed-off-by: GaryHyg <huygbj@inspur.com>
src/rgw/rgw_basic_types.h

index 0ba03bd0e27f860ac243f0013dcfb42b6a051cf3..c226b5777482b76f6d719d336b4a2792bfab880d 100644 (file)
@@ -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 {