Commit 14e8a9f9 authored by Michael Kozono's avatar Michael Kozono

Fix ability to choose shards for selective sync

parent ee793d67
...@@ -48,12 +48,12 @@ class Admin::Geo::NodesController < Admin::ApplicationController ...@@ -48,12 +48,12 @@ class Admin::Geo::NodesController < Admin::ApplicationController
:url, :url,
:primary, :primary,
:selective_sync_type, :selective_sync_type,
:selective_sync_shards,
:namespace_ids, :namespace_ids,
:repos_max_capacity, :repos_max_capacity,
:files_max_capacity, :files_max_capacity,
:verification_max_capacity, :verification_max_capacity,
:minimum_reverification_interval :minimum_reverification_interval,
selective_sync_shards: []
) )
end end
......
---
title: Fix ability to choose shards for selective sync
merge_request: 8717
author:
type: fixed
...@@ -86,7 +86,7 @@ describe Admin::Geo::NodesController, :postgresql do ...@@ -86,7 +86,7 @@ describe Admin::Geo::NodesController, :postgresql do
end end
describe '#update' do 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) } let(:geo_node) { create(:geo_node) }
...@@ -113,6 +113,7 @@ describe Admin::Geo::NodesController, :postgresql do ...@@ -113,6 +113,7 @@ describe Admin::Geo::NodesController, :postgresql do
geo_node.reload geo_node.reload
expect(geo_node.url.chomp('/')).to eq(geo_node_attributes[:url]) expect(geo_node.url.chomp('/')).to eq(geo_node_attributes[:url])
expect(geo_node.selective_sync_shards).to eq(%w[foo bar])
end end
it 'delegates the update of the Geo node to Geo::NodeUpdateService' do it 'delegates the update of the Geo node to Geo::NodeUpdateService' do
......
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