]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/lc: pass in flag as an argument when calling function complete(..) 55293/head
authorJane Zhu <jzhu116@bloomberg.net>
Wed, 24 Jan 2024 06:42:30 +0000 (01:42 -0500)
committerJuan Zhu <jzhu4@dev-10-34-20-139.pw1.bcc.bloomberg.com>
Wed, 24 Jan 2024 06:43:51 +0000 (01:43 -0500)
fixup for 17ca50e70421cfe263784e8d65008145221e41c3

Signed-off-by: Juan Zhu <jzhu4@dev-10-34-20-139.pw1.bcc.bloomberg.com>
src/rgw/rgw_file.cc
src/test/rgw/test_d4n_filter.cc

index f69ba543d898d5ed18d8ca5ad13780aaee98bb62..3424d4b04d7a04325be02e5e1c7b500cd4dc6d21 100644 (file)
@@ -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);
index b1483f26e0db379b9675f4bb1e57b776bb18d4a5..fc9255e14383e076fba810d83c2d0dc52603adb3 100644 (file)
@@ -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()) {