Commit e1b7781e authored by Ian Baum's avatar Ian Baum

Fix bug in LfsObject.replicables_for_current_secondary

* When selective sync is enabled, duplicate entries were created due to
  selective sync objects being loaded with ::Gitlab::Geo#lfs_obects, and
LfsObject.selective_sync_scope
parent 13b260da
...@@ -26,7 +26,6 @@ module EE ...@@ -26,7 +26,6 @@ module EE
def replicables_for_current_secondary(primary_key_in) def replicables_for_current_secondary(primary_key_in)
node = ::Gitlab::Geo.current_node node = ::Gitlab::Geo.current_node
node.lfs_objects(primary_key_in: primary_key_in) node.lfs_objects(primary_key_in: primary_key_in)
.merge(selective_sync_scope(node))
.merge(object_storage_scope(node)) .merge(object_storage_scope(node))
end end
...@@ -37,12 +36,6 @@ module EE ...@@ -37,12 +36,6 @@ module EE
with_files_stored_locally with_files_stored_locally
end end
def selective_sync_scope(node)
return all unless node.selective_sync?
project_id_in(node.projects)
end
end end
def log_geo_deleted_event def log_geo_deleted_event
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment