Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
174137fc
Commit
174137fc
authored
Jul 30, 2020
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag from container repository registry model
parent
e60ca686
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
28 deletions
+0
-28
ee/app/models/geo/container_repository_registry.rb
ee/app/models/geo/container_repository_registry.rb
+0
-4
ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb
...workers/geo/secondary/registry_consistency_worker_spec.rb
+0
-24
No files found.
ee/app/models/geo/container_repository_registry.rb
View file @
174137fc
...
...
@@ -55,10 +55,6 @@ class Geo::ContainerRepositoryRegistry < Geo::BaseRegistry
where
(
nil
).
pluck
(
:container_repository_id
)
end
def
self
.
registry_consistency_worker_enabled?
Feature
.
enabled?
(
:geo_container_registry_ssot_sync
,
default_enabled:
true
)
end
def
self
.
replication_enabled?
Gitlab
.
config
.
geo
.
registry_replication
.
enabled
end
...
...
ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb
View file @
174137fc
...
...
@@ -108,30 +108,6 @@ RSpec.describe Geo::Secondary::RegistryConsistencyWorker, :geo do
expect
(
Geo
::
ContainerRepositoryRegistry
.
where
(
container_repository_id:
container_repository
.
id
).
count
).
to
eq
(
1
)
end
context
'when geo_container_registry_ssot_sync is disabled'
do
before
do
stub_feature_flags
(
geo_container_registry_ssot_sync:
false
)
end
it
'returns false'
do
expect
(
subject
.
perform
).
to
be_falsey
end
it
'does not execute RegistryConsistencyService for container repositories'
do
allow
(
Geo
::
RegistryConsistencyService
).
to
receive
(
:new
).
with
(
Geo
::
JobArtifactRegistry
,
batch_size:
batch_size
).
and_call_original
allow
(
Geo
::
RegistryConsistencyService
).
to
receive
(
:new
).
with
(
Geo
::
LfsObjectRegistry
,
batch_size:
batch_size
).
and_call_original
allow
(
Geo
::
RegistryConsistencyService
).
to
receive
(
:new
).
with
(
Geo
::
PackageFileRegistry
,
batch_size:
batch_size
).
and_call_original
allow
(
Geo
::
RegistryConsistencyService
).
to
receive
(
:new
).
with
(
Geo
::
UploadRegistry
,
batch_size:
batch_size
).
and_call_original
allow
(
Geo
::
RegistryConsistencyService
).
to
receive
(
:new
).
with
(
Geo
::
ProjectRegistry
,
batch_size:
batch_size
).
and_call_original
allow
(
Geo
::
RegistryConsistencyService
).
to
receive
(
:new
).
with
(
Geo
::
DesignRegistry
,
batch_size:
batch_size
).
and_call_original
allow
(
Geo
::
RegistryConsistencyService
).
to
receive
(
:new
).
with
(
Geo
::
VulnerabilityExportRegistry
,
batch_size:
batch_size
).
and_call_original
expect
(
Geo
::
RegistryConsistencyService
).
not_to
receive
(
:new
).
with
(
Geo
::
ContainerRepositoryRegistry
,
batch_size:
batch_size
)
subject
.
perform
end
end
context
'when the current Geo node is disabled or primary'
do
before
do
stub_primary_node
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment