Skip to content

Commit 66ac828

Browse files
committed
rgw: fix issue with concurrent versioned deletes leaving behind olh entries
Fixes a scenario where BI OLH entries were left behind after racing delete requests for the same versioned object instance. Fixes: https://tracker.ceph.com/issues/64014 Signed-off-by: Cory Snyder <[email protected]>
1 parent b65046e commit 66ac828

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/cls/rgw/cls_rgw.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,11 +1906,10 @@ static int rgw_bucket_unlink_instance(cls_method_context_t hctx, bufferlist *in,
19061906
BIOLHEntry olh(hctx, dest_key);
19071907

19081908
int ret = obj.init();
1909-
if (ret == -ENOENT) {
1910-
return 0; /* already removed */
1911-
}
19121909
if (ret < 0) {
1913-
CLS_LOG(0, "ERROR: obj.init() returned ret=%d", ret);
1910+
if (ret != -ENOENT) {
1911+
CLS_LOG(0, "ERROR: obj.init() returned ret=%d", ret);
1912+
}
19141913
return ret;
19151914
}
19161915

0 commit comments

Comments
 (0)