Commit ed23254b authored by Mike Kozono's avatar Mike Kozono

Remove node argument

because it is unused, and it looks like you could even pass in a primary
node, which is not true since the implementations do not really make
sense in that context.
parent 8ddd04b3
...@@ -83,9 +83,10 @@ module EE ...@@ -83,9 +83,10 @@ module EE
end end
# @param primary_key_in [Range, Ci::JobArtifact] arg to pass to primary_key_in scope # @param primary_key_in [Range, Ci::JobArtifact] arg to pass to primary_key_in scope
# @param node [GeoNode] defaults to ::Gitlab::Geo.current_node
# @return [ActiveRecord::Relation<Ci::JobArtifact>] everything that should be synced to this node, restricted by primary key # @return [ActiveRecord::Relation<Ci::JobArtifact>] everything that should be synced to this node, restricted by primary key
def replicables_for_geo_node(primary_key_in, node = ::Gitlab::Geo.current_node) def replicables_for_geo_node(primary_key_in)
node = ::Gitlab::Geo.current_node
not_expired not_expired
.primary_key_in(primary_key_in) .primary_key_in(primary_key_in)
.merge(selective_sync_scope(node)) .merge(selective_sync_scope(node))
......
...@@ -10,9 +10,10 @@ module EE ...@@ -10,9 +10,10 @@ module EE
class_methods do class_methods do
# @param primary_key_in [Range, ContainerRepository] arg to pass to primary_key_in scope # @param primary_key_in [Range, ContainerRepository] arg to pass to primary_key_in scope
# @param node [GeoNode] defaults to ::Gitlab::Geo.current_node
# @return [ActiveRecord::Relation<ContainerRepository>] everything that should be synced to this node, restricted by primary key # @return [ActiveRecord::Relation<ContainerRepository>] everything that should be synced to this node, restricted by primary key
def replicables_for_geo_node(primary_key_in, node = ::Gitlab::Geo.current_node) def replicables_for_geo_node(primary_key_in)
node = ::Gitlab::Geo.current_node
node.container_repositories.primary_key_in(primary_key_in) node.container_repositories.primary_key_in(primary_key_in)
end end
end end
......
...@@ -18,9 +18,9 @@ module EE ...@@ -18,9 +18,9 @@ module EE
class_methods do class_methods do
# @param primary_key_in [Range, LfsObject] arg to pass to primary_key_in scope # @param primary_key_in [Range, LfsObject] arg to pass to primary_key_in scope
# @param node [GeoNode] defaults to ::Gitlab::Geo.current_node
# @return [ActiveRecord::Relation<LfsObject>] everything that should be synced to this node, restricted by primary key # @return [ActiveRecord::Relation<LfsObject>] everything that should be synced to this node, restricted by primary key
def replicables_for_geo_node(primary_key_in, node = ::Gitlab::Geo.current_node) def replicables_for_geo_node(primary_key_in)
node = ::Gitlab::Geo.current_node
local_storage_only = !node.sync_object_storage local_storage_only = !node.sync_object_storage
scope = node.lfs_objects(primary_key_in: primary_key_in) scope = node.lfs_objects(primary_key_in: primary_key_in)
......
...@@ -30,9 +30,10 @@ module EE ...@@ -30,9 +30,10 @@ module EE
class_methods do class_methods do
# @param primary_key_in [Range, MergeRequestDiff] arg to pass to primary_key_in scope # @param primary_key_in [Range, MergeRequestDiff] arg to pass to primary_key_in scope
# @param node [GeoNode] defaults to ::Gitlab::Geo.current_node
# @return [ActiveRecord::Relation<MergeRequestDiff>] everything that should be synced to this node, restricted by primary key # @return [ActiveRecord::Relation<MergeRequestDiff>] everything that should be synced to this node, restricted by primary key
def replicables_for_geo_node(primary_key_in, node = ::Gitlab::Geo.current_node) def replicables_for_geo_node(primary_key_in)
node = ::Gitlab::Geo.current_node
has_external_diffs.primary_key_in(primary_key_in) has_external_diffs.primary_key_in(primary_key_in)
.merge(selective_sync_scope(node)) .merge(selective_sync_scope(node))
.merge(object_storage_scope(node)) .merge(object_storage_scope(node))
......
...@@ -205,9 +205,10 @@ module EE ...@@ -205,9 +205,10 @@ module EE
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
# @param primary_key_in [Range, Project] arg to pass to primary_key_in scope # @param primary_key_in [Range, Project] arg to pass to primary_key_in scope
# @param node [GeoNode] defaults to ::Gitlab::Geo.current_node
# @return [ActiveRecord::Relation<Project>] everything that should be synced to this node, restricted by primary key # @return [ActiveRecord::Relation<Project>] everything that should be synced to this node, restricted by primary key
def replicables_for_geo_node(primary_key_in, node = ::Gitlab::Geo.current_node) def replicables_for_geo_node(primary_key_in)
node = ::Gitlab::Geo.current_node
node.projects.primary_key_in(primary_key_in) node.projects.primary_key_in(primary_key_in)
end end
......
...@@ -12,9 +12,8 @@ module EE ...@@ -12,9 +12,8 @@ module EE
class_methods do class_methods do
# @param primary_key_in [Range, SnippetRepository] arg to pass to primary_key_in scope # @param primary_key_in [Range, SnippetRepository] arg to pass to primary_key_in scope
# @param node [GeoNode] defaults to ::Gitlab::Geo.current_node
# @return [ActiveRecord::Relation<SnippetRepository>] everything that should be synced to this node, restricted by primary key # @return [ActiveRecord::Relation<SnippetRepository>] everything that should be synced to this node, restricted by primary key
def replicables_for_geo_node(primary_key_in, node = ::Gitlab::Geo.current_node) def replicables_for_geo_node(primary_key_in)
# Not implemented yet. Should be responsible for selective sync # Not implemented yet. Should be responsible for selective sync
all all
end end
......
...@@ -15,9 +15,10 @@ module EE ...@@ -15,9 +15,10 @@ module EE
class_methods do class_methods do
# @param primary_key_in [Range, Terraform::StateVersion] arg to pass to primary_key_in scope # @param primary_key_in [Range, Terraform::StateVersion] arg to pass to primary_key_in scope
# @param node [GeoNode] defaults to ::Gitlab::Geo.current_node
# @return [ActiveRecord::Relation<Terraform::StateVersion>] everything that should be synced to this node, restricted by primary key # @return [ActiveRecord::Relation<Terraform::StateVersion>] everything that should be synced to this node, restricted by primary key
def replicables_for_geo_node(primary_key_in, node = ::Gitlab::Geo.current_node) def replicables_for_geo_node(primary_key_in)
node = ::Gitlab::Geo.current_node
primary_key_in(primary_key_in) primary_key_in(primary_key_in)
.merge(selective_sync_scope(node)) .merge(selective_sync_scope(node))
.merge(object_storage_scope(node)) .merge(object_storage_scope(node))
......
...@@ -19,9 +19,10 @@ module EE ...@@ -19,9 +19,10 @@ module EE
class_methods do class_methods do
# @param primary_key_in [Range, Upload] arg to pass to primary_key_in scope # @param primary_key_in [Range, Upload] arg to pass to primary_key_in scope
# @param node [GeoNode] defaults to ::Gitlab::Geo.current_node
# @return [ActiveRecord::Relation<Upload>] everything that should be synced to this node, restricted by primary key # @return [ActiveRecord::Relation<Upload>] everything that should be synced to this node, restricted by primary key
def replicables_for_geo_node(primary_key_in, node = ::Gitlab::Geo.current_node) def replicables_for_geo_node(primary_key_in)
node = ::Gitlab::Geo.current_node
primary_key_in(primary_key_in) primary_key_in(primary_key_in)
.merge(selective_sync_scope(node)) .merge(selective_sync_scope(node))
.merge(object_storage_scope(node)) .merge(object_storage_scope(node))
......
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