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
14e8a9f9
Commit
14e8a9f9
authored
Dec 05, 2018
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ability to choose shards for selective sync
parent
ee793d67
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
ee/app/controllers/admin/geo/nodes_controller.rb
ee/app/controllers/admin/geo/nodes_controller.rb
+2
-2
ee/changelogs/unreleased/mk-fix-selective-sync-by-shards.yml
ee/changelogs/unreleased/mk-fix-selective-sync-by-shards.yml
+5
-0
ee/spec/controllers/admin/geo/nodes_controller_spec.rb
ee/spec/controllers/admin/geo/nodes_controller_spec.rb
+2
-1
No files found.
ee/app/controllers/admin/geo/nodes_controller.rb
View file @
14e8a9f9
...
...
@@ -48,12 +48,12 @@ class Admin::Geo::NodesController < Admin::ApplicationController
:url
,
:primary
,
:selective_sync_type
,
:selective_sync_shards
,
:namespace_ids
,
:repos_max_capacity
,
:files_max_capacity
,
:verification_max_capacity
,
:minimum_reverification_interval
:minimum_reverification_interval
,
selective_sync_shards:
[]
)
end
...
...
ee/changelogs/unreleased/mk-fix-selective-sync-by-shards.yml
0 → 100644
View file @
14e8a9f9
---
title
:
Fix ability to choose shards for selective sync
merge_request
:
8717
author
:
type
:
fixed
ee/spec/controllers/admin/geo/nodes_controller_spec.rb
View file @
14e8a9f9
...
...
@@ -86,7 +86,7 @@ describe Admin::Geo::NodesController, :postgresql do
end
describe
'#update'
do
let
(
:geo_node_attributes
)
{
{
url:
'http://example.com'
}
}
let
(
:geo_node_attributes
)
{
{
url:
'http://example.com'
,
selective_sync_shards:
%w[foo bar]
}
}
let
(
:geo_node
)
{
create
(
:geo_node
)
}
...
...
@@ -113,6 +113,7 @@ describe Admin::Geo::NodesController, :postgresql do
geo_node
.
reload
expect
(
geo_node
.
url
.
chomp
(
'/'
)).
to
eq
(
geo_node_attributes
[
:url
])
expect
(
geo_node
.
selective_sync_shards
).
to
eq
(
%w[foo bar]
)
end
it
'delegates the update of the Geo node to Geo::NodeUpdateService'
do
...
...
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