diff options
| author | Jane Zhu <jzhu116@bloomberg.net> | 2024-01-24 07:42:30 +0100 |
|---|---|---|
| committer | Juan Zhu <jzhu4@dev-10-34-20-139.pw1.bcc.bloomberg.com> | 2024-01-24 07:43:51 +0100 |
| commit | c90e8148e46ad6b85850ecfa8abdc38449986727 (patch) | |
| tree | 57febca0102d2587a9b676a919fd53566354031c | |
| parent | Merge pull request #55183 from galsalomon66/s3select_fixes_QE_bugs (diff) | |
| download | ceph-c90e8148e46ad6b85850ecfa8abdc38449986727.tar.xz ceph-c90e8148e46ad6b85850ecfa8abdc38449986727.zip | |
rgw/lc: pass in flag as an argument when calling function complete(..)
fixup for 17ca50e70421cfe263784e8d65008145221e41c3
Signed-off-by: Juan Zhu <jzhu4@dev-10-34-20-139.pw1.bcc.bloomberg.com>
| -rw-r--r-- | src/rgw/rgw_file.cc | 2 | ||||
| -rw-r--r-- | src/test/rgw/test_d4n_filter.cc | 10 |
2 files changed, 6 insertions, 6 deletions
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<rgw::sal::Object> 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<rgw::sal::Object> 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()) { |