Commit 9401d113 authored by Michael Kozono's avatar Michael Kozono

Merge branch 'alexives/247100/remove_feature_flag_for_merge_request_diffs' into 'master'

Release the merge request diff replication

See merge request gitlab-org/gitlab!45224
parents 457b6315 771e7fc6
......@@ -7284,8 +7284,7 @@ type GeoNode {
internalUrl: String
"""
Find merge request diff registries on this Geo node. Available only when
feature flag `geo_merge_request_diff_replication` is enabled
Find merge request diff registries on this Geo node
"""
mergeRequestDiffRegistries(
"""
......
......@@ -20066,7 +20066,7 @@
},
{
"name": "mergeRequestDiffRegistries",
"description": "Find merge request diff registries on this Geo node. Available only when feature flag `geo_merge_request_diff_replication` is enabled",
"description": "Find merge request diff registries on this Geo node",
"args": [
{
"name": "ids",
......@@ -25,8 +25,7 @@ module Types
field :merge_request_diff_registries, ::Types::Geo::MergeRequestDiffRegistryType.connection_type,
null: true,
resolver: ::Resolvers::Geo::MergeRequestDiffRegistriesResolver,
description: 'Find merge request diff registries on this Geo node',
feature_flag: :geo_merge_request_diff_replication
description: 'Find merge request diff registries on this Geo node'
field :package_file_registries, ::Types::Geo::PackageFileRegistryType.connection_type,
null: true,
resolver: ::Resolvers::Geo::PackageFileRegistriesResolver,
......
......@@ -8,10 +8,6 @@ module Geo
::MergeRequestDiff
end
def self.replication_enabled_by_default?
false
end
def self.primary_total_count
model.has_external_diffs.count
end
......
---
title: Enable geo replication for merge request diffs
merge_request: 45224
author:
type: added
......@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34248
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/247100
group: group::geo
type: development
default_enabled: false
\ No newline at end of file
default_enabled: true
......@@ -111,23 +111,6 @@ RSpec.describe Geo::Secondary::RegistryConsistencyWorker, :geo do
expect(Geo::UploadRegistry.where(file_id: upload.id).count).to eq(1)
end
context 'when geo_merge_request_diff_replication is disabled' do
before do
stub_feature_flags(geo_merge_request_diff_replication: false)
end
it 'returns false' do
expect(subject.perform).to be_falsey
end
it 'does not execute RegistryConsistencyService for merge request diffs' do
allow(Geo::RegistryConsistencyService).to receive(:new).and_call_original
expect(Geo::RegistryConsistencyService).not_to receive(:new).with(Geo::MergeRequestDiffRegistry, batch_size: batch_size)
subject.perform
end
end
context 'when the current Geo node is disabled or primary' do
before do
stub_primary_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