From: Jane Zhu Date: Wed, 24 Jan 2024 06:42:30 +0000 (-0500) Subject: rgw/lc: pass in flag as an argument when calling function complete(..) X-Git-Tag: v19.3.0~78^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F55293%2Fhead;p=ceph.git rgw/lc: pass in flag as an argument when calling function complete(..) fixup for 17ca50e70421cfe263784e8d65008145221e41c3 Signed-off-by: Juan Zhu --- diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc index f69ba543d89..3424d4b04d7 100644 --- a/src/rgw/rgw_file.cc +++ b/src/rgw/rgw_file.cc @@ -2020,7 +2020,7 @@ namespace rgw { op_ret = processor->complete(state->obj_size, etag, &mtime, real_time(), attrs, (delete_at ? *delete_at : real_time()), if_match, if_nomatch, nullptr, nullptr, nullptr, - rctx, true); + rctx, rgw::sal::FLAG_LOG_OP); if (op_ret != 0) { /* revert attr updates */ rgw_fh->set_mtime(omtime); diff --git a/src/test/rgw/test_d4n_filter.cc b/src/test/rgw/test_d4n_filter.cc index b1483f26e0d..fc9255e1438 100644 --- a/src/test/rgw/test_d4n_filter.cc +++ b/src/test/rgw/test_d4n_filter.cc @@ -169,7 +169,7 @@ class D4NFilterFixture : public ::testing::Test { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx, true); + rctx, rgw::sal::FLAG_LOG_OP); return ret; } @@ -429,7 +429,7 @@ TEST_F(D4NFilterFixture, CopyObjectReplace) { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx, true), 0); + rctx, rgw::sal::FLAG_LOG_OP), 0); unique_ptr testObject_copy = testBucket->get_object(rgw_obj_key("test_object_copy")); @@ -554,7 +554,7 @@ TEST_F(D4NFilterFixture, CopyObjectMerge) { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx, true), 0); + rctx, rgw::sal::FLAG_LOG_OP), 0); unique_ptr testObject_copy = testBucket->get_object(rgw_obj_key("test_object_copy")); @@ -1881,7 +1881,7 @@ TEST_F(D4NFilterFixture, DataCheck) { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx, true), 0); + rctx, rgw::sal::FLAG_LOG_OP), 0); client.hget("rgw-object:test_object_DataCheck:cache", "data", [&data](cpp_redis::reply& reply) { if (reply.is_string()) { @@ -1906,7 +1906,7 @@ TEST_F(D4NFilterFixture, DataCheck) { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx, true), 0); + rctx, rgw::sal::FLAG_LOG_OP), 0); client.hget("rgw-object:test_object_DataCheck:cache", "data", [&dataNew](cpp_redis::reply& reply) { if (reply.is_string()) {