rgw: disable sync squash for versioned objects #13426
Conversation
| @@ -2530,11 +2534,12 @@ int RGWBucketShardIncrementalSyncCR::operate() | |||
| marker_tracker.try_update_high_marker(cur_id, 0, entry->timestamp); | |||
| continue; | |||
| } | |||
| if (make_pair<>(entry->timestamp, entry->op) != squash_map[make_pair(entry->object, entry->instance)]) { | |||
| if (entry->instance.empty() && | |||
| make_pair<>(entry->timestamp, entry->op) != squash_map[make_pair(entry->object, entry->instance)]) { | |||
There was a problem hiding this comment.
can we revert the commit ce7d00a that added instance to the squash_map keys now that we're not using it?
There was a problem hiding this comment.
@cbodley I'm not extremely happy about this fix, would rather understand the exact root cause before. The mtime issue was a problem, but I think there's another issue coming into play (I think it's del squashing unlink_instance), but still need to verify.
There was a problem hiding this comment.
that commit removed a special case related to OP_DEL, maybe that's relevant to this issue
|
also |
This is needed so that when squashing entries during data sync we get a consistent mtime for that object. Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Fixes: http://tracker.ceph.com/issues/18939 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
|
@mattbenjamin @oritwas rebased |
|
pulled the mtime change into a separate pr #20016 |
|
@yehudasa pls rebase --- pr 13426 --- pulling https://github.com/yehudasa/ceph.git branch wip-18939
|
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. |
|
This pull request has been automatically closed because there has been no activity for 90 days. Please feel free to reopen this pull request (or open a new one) if the proposed change is still appropriate. Thank you for your contribution! |
and also modify mtime reported on unlink_instance operation.
Fixes: http://tracker.ceph.com/issues/18939