From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 15 Oct 2018 20:38:31 +0000 (-0400)
Subject: rgw: cls_user_set_buckets_info can update bucket id
X-Git-Tag: v13.2.3~46^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d93ca5c342eea3eef4ffc42dd0f0051185cf5d07;p=ceph.git

rgw: cls_user_set_buckets_info can update bucket id

if cls_user_set_bucket_info() finds an existing bucket entry, it does
not update its bucket id

Fixes: https://tracker.ceph.com/issues/24505

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit e1b97fc2e804d040e8aa6fc8a94e336222d1175e)
---

diff --git a/src/cls/user/cls_user.cc b/src/cls/user/cls_user.cc
index d350a7a1292b..6fc34b976918 100644
--- a/src/cls/user/cls_user.cc
+++ b/src/cls/user/cls_user.cc
@@ -145,6 +145,9 @@ static int cls_user_set_buckets_info(cls_method_context_t hctx, bufferlist *in,
      entry = update_entry;
 
      ret = 0;
+    } else if (op.add) {
+      // bucket id may have changed (ie reshard)
+      entry.bucket.bucket_id = update_entry.bucket.bucket_id;
     }
 
     if (ret < 0) {