Skip to content

Commit 60da519

Browse files
authored
Merge pull request ceph#55293 from jzhu116-bloomberg/wip-63178
rgw/lc: pass in flag as an argument when calling function complete(..) Reviewed-by: Casey Bodley <[email protected]>
2 parents 5d8a014 + c90e814 commit 60da519

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/rgw/rgw_file.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2020,7 +2020,7 @@ namespace rgw {
20202020
op_ret = processor->complete(state->obj_size, etag, &mtime, real_time(), attrs,
20212021
(delete_at ? *delete_at : real_time()),
20222022
if_match, if_nomatch, nullptr, nullptr, nullptr,
2023-
rctx, true);
2023+
rctx, rgw::sal::FLAG_LOG_OP);
20242024
if (op_ret != 0) {
20252025
/* revert attr updates */
20262026
rgw_fh->set_mtime(omtime);

src/test/rgw/test_d4n_filter.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class D4NFilterFixture : public ::testing::Test {
183183
&if_match, &if_nomatch,
184184
&user_data,
185185
&zones_trace, &canceled,
186-
rctx, true);
186+
rctx, rgw::sal::FLAG_LOG_OP);
187187

188188
return ret;
189189
}
@@ -443,7 +443,7 @@ TEST_F(D4NFilterFixture, CopyObjectReplace) {
443443
&if_match, &if_nomatch,
444444
&user_data,
445445
&zones_trace, &canceled,
446-
rctx, true), 0);
446+
rctx, rgw::sal::FLAG_LOG_OP), 0);
447447

448448
unique_ptr<rgw::sal::Object> testObject_copy = testBucket->get_object(rgw_obj_key("test_object_copy"));
449449

@@ -568,7 +568,7 @@ TEST_F(D4NFilterFixture, CopyObjectMerge) {
568568
&if_match, &if_nomatch,
569569
&user_data,
570570
&zones_trace, &canceled,
571-
rctx, true), 0);
571+
rctx, rgw::sal::FLAG_LOG_OP), 0);
572572

573573
unique_ptr<rgw::sal::Object> testObject_copy = testBucket->get_object(rgw_obj_key("test_object_copy"));
574574

@@ -1895,7 +1895,7 @@ TEST_F(D4NFilterFixture, DataCheck) {
18951895
&if_match, &if_nomatch,
18961896
&user_data,
18971897
&zones_trace, &canceled,
1898-
rctx, true), 0);
1898+
rctx, rgw::sal::FLAG_LOG_OP), 0);
18991899

19001900
client.hget("rgw-object:test_object_DataCheck:cache", "data", [&data](cpp_redis::reply& reply) {
19011901
if (reply.is_string()) {
@@ -1920,7 +1920,7 @@ TEST_F(D4NFilterFixture, DataCheck) {
19201920
&if_match, &if_nomatch,
19211921
&user_data,
19221922
&zones_trace, &canceled,
1923-
rctx, true), 0);
1923+
rctx, rgw::sal::FLAG_LOG_OP), 0);
19241924

19251925
client.hget("rgw-object:test_object_DataCheck:cache", "data", [&dataNew](cpp_redis::reply& reply) {
19261926
if (reply.is_string()) {

0 commit comments

Comments
 (0)