Skip to content

G
gitlab-ce
Commit 9401d113 authored by Michael Kozono's avatar Michael Kozono
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 54 deletions
doc/administration/geo/replication/datatypes.md
View file @ 9401d113
......@@ -24,7 +24,7 @@ See the list below of each feature or component we replicate, its corresponding
verification methods:
| Type | Feature / component | Replication method | Verification method |
|:---------|:----------------------------------------------|:--------------------------------------|:-----------------------|
|:---------|:------------------------------------------------|:--------------------------------------|:-----------------------|
| Database | Application data in PostgreSQL | Native | Native |
| Database | Redis | _N/A_ (*1*) | _N/A_ |
| Database | Elasticsearch | Native | Native |
......@@ -49,6 +49,8 @@ verification methods:
| Blobs | Package registry _(object storage)_ | Geo with API/Managed (*2*) | _Not implemented_ |
| Blobs | Versioned Terraform State _(filesystem)_ | Geo with API | _Not implemented_ |
| Blobs | Versioned Terraform State _(object storage)_ | Geo with API/Managed (*2*) | _Not implemented_ |
| Blobs | External Merge Request Diffs _(filesystem)_ | Geo with API | _Not implemented_ |
| Blobs | External Merge Request Diffs _(object storage)_ | Geo with API/Managed (*2*) | _Not implemented_ |
- (*1*): Redis replication can be used as part of HA with Redis sentinel. It's not used between Geo nodes.
- (*2*): Object storage replication can be performed by Geo or by your object storage provider/appliance
......@@ -185,7 +187,7 @@ successfully, you must replicate their data using some other means.
| [Composer Repository](../../../user/packages/composer_repository/index.md) | **Yes** (13.2) | [No](https://gitlab.com/groups/gitlab-org/-/epics/1817) | Via Object Storage provider if supported. Native Geo support (Beta). | Behind feature flag `geo_package_file_replication`, enabled by default |
| [Generic packages](../../../user/packages/generic_packages/index.md) | **Yes** (13.5) | [No](https://gitlab.com/groups/gitlab-org/-/epics/1817) | Via Object Storage provider if supported. Native Geo support (Beta). | Behind feature flag `geo_package_file_replication`, enabled by default |
| [Versioned Terraform State](../../terraform_state.md) | **Yes** (13.5) | No | Via Object Storage provider if supported. Native Geo support (Beta). | Behind feature flag `geo_terraform_state_version_replication`, enabled by default |
| [External merge request diffs](../../merge_request_diffs.md) | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/33817) | No | Via Object Storage provider if supported. Native Geo support (Beta). | |
| [External merge request diffs](../../merge_request_diffs.md) | **Yes** (13.5) | No | Behind feature flag `geo_merge_request_diff_replication`, enabled by default | |
| [Versioned snippets](../../../user/snippets.md#versioned-snippets) | [No](https://gitlab.com/groups/gitlab-org/-/epics/2809) | [No](https://gitlab.com/groups/gitlab-org/-/epics/2810) | No | |
| [Server-side Git hooks](../../server_hooks.md) | [No](https://gitlab.com/groups/gitlab-org/-/epics/1867) | No | No | |
| [Elasticsearch integration](../../../integration/elasticsearch.md) | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/1186) | No | No | |
......
doc/api/graphql/reference/gitlab_schema.graphql
View file @ 9401d113
......@@ -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(
"""
......
doc/api/graphql/reference/gitlab_schema.json
View file @ 9401d113
......@@ -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",
ee/app/graphql/types/geo/geo_node_type.rb
View file @ 9401d113
......@@ -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,
......
ee/app/replicators/geo/merge_request_diff_replicator.rb
View file @ 9401d113
......@@ -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
......
ee/changelogs/unreleased/247100-remove_feature_flag_for_merge_request_diffs.yml 0 → 100644
View file @ 9401d113
---
title: Enable geo replication for merge request diffs
merge_request: 45224
author:
type: added
ee/config/feature_flags/development/geo_merge_request_diff_replication.yml
View file @ 9401d113
......@@ -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
ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb
View file @ 9401d113
......@@ -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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7