From 813212671cc26ec7e9e6c9b9e146cb7b31981709 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 4 Mar 2019 16:47:31 -0500 Subject: [PATCH] cls/rgw: don't add canceled ops to bilog Signed-off-by: Casey Bodley --- src/cls/rgw/cls_rgw.cc | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc index 774a9871d48..84604b7eca9 100644 --- a/src/cls/rgw/cls_rgw.cc +++ b/src/cls/rgw/cls_rgw.cc @@ -853,23 +853,10 @@ int rgw_bucket_complete_op(cls_method_context_t hctx, bufferlist *in, bufferlist bufferlist op_bl; if (cancel) { - if (op.log_op && !header.syncstopped) { - rc = log_index_operation(hctx, op.key, op.op, op.tag, entry.meta.mtime, entry.ver, - CLS_RGW_STATE_COMPLETE, header.ver, header.max_marker, op.bilog_flags, NULL, NULL, &op.zones_trace); - if (rc < 0) - return rc; - } - if (op.tag.size()) { bufferlist new_key_bl; encode(entry, new_key_bl); - rc = cls_cxx_map_set_val(hctx, idx, &new_key_bl); - if (rc < 0) - return rc; - } - - if (op.log_op && !header.syncstopped) { - return write_bucket_header(hctx, &header); + return cls_cxx_map_set_val(hctx, idx, &new_key_bl); } return 0; } -- 2.39.5