Skip to content

Commit b9a467f

Browse files
authored
Merge pull request ceph#55627 from smanjara/wip-fix-log-op
rgw: don't pass log_op into link_olh during PutObject. Reviewed-by: Jane Zhu <[email protected]> Reviewed-by: Casey Bodley <[email protected]>
2 parents 87f6091 + 6cc1c2d commit b9a467f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/rgw/driver/rados/rgw_rados.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3269,7 +3269,8 @@ int RGWRados::Object::Write::_do_write_meta(uint64_t size, uint64_t accounted_si
32693269
state = NULL;
32703270

32713271
if (versioned_op && meta.olh_epoch) {
3272-
r = store->set_olh(rctx.dpp, target->get_ctx(), target->get_bucket_info(), obj, false, NULL, *meta.olh_epoch, real_time(), false, rctx.y, meta.zones_trace, log_op);
3272+
bool add_log = log_op && store->svc.zone->need_to_log_data();
3273+
r = store->set_olh(rctx.dpp, target->get_ctx(), target->get_bucket_info(), obj, false, NULL, *meta.olh_epoch, real_time(), false, rctx.y, meta.zones_trace, add_log);
32733274
if (r < 0) {
32743275
return r;
32753276
}

0 commit comments

Comments
 (0)