From 1e464e304e0e2047005ac9e35e65f1435d388801 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 15 Oct 2018 16:38:31 -0400 Subject: [PATCH] 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 (cherry picked from commit e1b97fc2e804d040e8aa6fc8a94e336222d1175e) --- src/cls/user/cls_user.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cls/user/cls_user.cc b/src/cls/user/cls_user.cc index 9a9c5bd9f7ebb..fa4b5816a16c1 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) { -- 2.47.3