From 672eea5d88099a590ddf847ad080214944c780cb Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Fri, 17 Nov 2017 15:59:44 -0500 Subject: [PATCH] rgw: Handle stale bucket info in RGWSetBucketVersioning Signed-off-by: Adam C. Emerson (cherry picked from commit a0a1e7c2ef992b8758bcfb20d893730c1b202475) Fixes: http://tracker.ceph.com/issues/22517 --- src/rgw/rgw_op.cc | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 213ce5ab7913e..5f9295c236d05 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -2111,15 +2111,18 @@ void RGWSetBucketVersioning::execute() } } - if (enable_versioning) { - s->bucket_info.flags |= BUCKET_VERSIONED; - s->bucket_info.flags &= ~BUCKET_VERSIONS_SUSPENDED; - } else { - s->bucket_info.flags |= (BUCKET_VERSIONED | BUCKET_VERSIONS_SUSPENDED); - } + op_ret = retry_raced_bucket_write(store, s, [this] { + if (enable_versioning) { + s->bucket_info.flags |= BUCKET_VERSIONED; + s->bucket_info.flags &= ~BUCKET_VERSIONS_SUSPENDED; + } else { + s->bucket_info.flags |= (BUCKET_VERSIONED | BUCKET_VERSIONS_SUSPENDED); + } + + return store->put_bucket_instance_info(s->bucket_info, false, real_time(), + &s->bucket_attrs); + }); - op_ret = store->put_bucket_instance_info(s->bucket_info, false, real_time(), - &s->bucket_attrs); if (op_ret < 0) { ldout(s->cct, 0) << "NOTICE: put_bucket_info on bucket=" << s->bucket.name << " returned err=" << op_ret << dendl; -- 2.39.5