rgw: rgw_obj comparison also accounts for bucket id

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a7f32c4b1bd951b1a18b7d13013dc8e2822d6ffc)

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 39e0d4acd3f5016f0872fc1118d0b819e3885482..a907f441bfcdadd0255ba59cd441b643d2de0faf 100644 (file)
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -1713,13 +1713,16 @@ public:
   bool operator<(const rgw_obj& o) const {
     int r = bucket.name.compare(o.bucket.name);
     if (r == 0) {
-     r = object.compare(o.object);
-     if (r == 0) {
-       r = ns.compare(o.ns);
-       if (r == 0) {
-         r = instance.compare(o.instance);
-       }
-     }
+      r = bucket.bucket_id.compare(o.bucket.bucket_id);
+      if (r == 0) {
+        r = object.compare(o.object);
+        if (r == 0) {
+          r = ns.compare(o.ns);
+          if (r == 0) {
+            r = instance.compare(o.instance);
+          }
+        }
+      }
     }
 
     return (r < 0);