RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38228 from ivancich/wip-rgw-gc-defer-should-not-enqueue

Browse Source 
rgw: during GC defer, prevent new GC enqueue

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
J. Eric Ivancich 2020-11-22 10:36:48 -05:00 committed by GitHub
commit cf18f7e9cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cls/rgw_gc/cls_rgw_gc.cc
View File

@ -502,6 +502,11 @@ static int cls_rgw_gc_queue_update_entry(cls_method_context_t hctx, bufferlist *
return -ENOSPC;
}
// Due to Tracker 47866 we are no longer executing this code, as it
// appears to possibly create a GC entry for an object that has not
// been deleted. Instead we will log at level 0 to perhaps confirm
// that when and how often this bug would otherwise be hit.
#if 0
cls_queue_enqueue_op enqueue_op;
bufferlist bl_data;
encode(op.info, bl_data);
@ -512,6 +517,16 @@ static int cls_rgw_gc_queue_update_entry(cls_method_context_t hctx, bufferlist *
if (ret < 0) {
return ret;
}
#else
std::string first_chain = "<empty-chain>";
if (! op.info.chain.objs.empty()) {
first_chain = op.info.chain.objs.cbegin()->key.name;
}
CLS_LOG(0,
"INFO: refrained from enqueueing GC entry during GC defer"
" tag=%s, first_chain=%s\n",
op.info.tag.c_str(), first_chain.c_str());
#endif
if (has_urgent_data) {
head.bl_urgent_data.clear();