Skip to content

Commit f6f2b88

Browse files
authored
Merge pull request ceph#59609 from cbodley/wip-rgw-dir-suggest-reshard
rgw/rados: guard against dir suggest during reshard Reviewed-by: Matt Benjamin <[email protected]>
2 parents 9e1a2c0 + 461be1c commit f6f2b88

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/rgw/driver/rados/rgw_rados.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9843,6 +9843,8 @@ int RGWRados::cls_bucket_list_ordered(const DoutPrefixProvider *dpp,
98439843
for (auto& miter : updates) {
98449844
if (miter.second.length()) {
98459845
ObjectWriteOperation o;
9846+
o.assert_exists();
9847+
cls_rgw_guard_bucket_resharding(o, -ERR_BUSY_RESHARDING);
98469848
cls_rgw_suggest_changes(o, miter.second);
98479849
// we don't care if we lose suggested updates, send them off blindly
98489850
AioCompletion *c =
@@ -10078,6 +10080,8 @@ int RGWRados::cls_bucket_list_unordered(const DoutPrefixProvider *dpp,
1007810080
for (; miter != updates.end(); ++miter) {
1007910081
if (miter->second.length()) {
1008010082
ObjectWriteOperation o;
10083+
o.assert_exists();
10084+
cls_rgw_guard_bucket_resharding(o, -ERR_BUSY_RESHARDING);
1008110085
cls_rgw_suggest_changes(o, miter->second);
1008210086
// we don't care if we lose suggested updates, send them off blindly
1008310087
AioCompletion *c = librados::Rados::aio_create_completion(nullptr, nullptr);

0 commit comments

Comments
 (0)