Skip to content
Snippets Groups Projects
Verified Commit 687d5636 authored by Rémy Coutable's avatar Rémy Coutable Committed by GitLab
Browse files

Merge branch 'fix-rubocop-elastic-migration-worker' into 'master'

Fix Rubocop offenses for elastic migration worker

See merge request !171116



Merged-by: default avatarRémy Coutable <remy@rymai.me>
Approved-by: Alex Buijs's avatarAlex Buijs <abuijs@gitlab.com>
Approved-by: default avatarRémy Coutable <remy@rymai.me>
Reviewed-by: default avatarRémy Coutable <remy@rymai.me>
Co-authored-by: default avatarArturo Herrero <arturo.herrero@gmail.com>
parents 52ec1c1e 3b13b403
No related branches found
No related tags found
2 merge requests!171309Draft: Fetch issues / MRs / epics count in the sidebar with GraphQL,!171116Fix Rubocop offenses for elastic migration worker
Pipeline #1521753079 passed
......@@ -230,7 +230,6 @@ RSpec/ReceiveMessages:
- 'ee/spec/views/trial_registrations/new.html.haml_spec.rb'
- 'ee/spec/workers/active_user_count_threshold_worker_spec.rb'
- 'ee/spec/workers/anti_abuse/new_abuse_report_worker_spec.rb'
- 'ee/spec/workers/elastic/migration_worker_spec.rb'
- 'qa/spec/page/logging_spec.rb'
- 'qa/spec/resource/base_spec.rb'
- 'qa/spec/resource/events/project_spec.rb'
......
......@@ -41,8 +41,7 @@
before do
allow(Gitlab::Elastic::Helper).to receive(:default).and_return(helper)
allow(helper).to receive(:unsupported_version?).and_return(true)
allow(helper).to receive(:alias_exists?).and_return(true)
allow(helper).to receive_messages(unsupported_version?: true, alias_exists?: true)
end
it 'pauses indexing and does not execute migration' do
......@@ -59,8 +58,7 @@
allow(Gitlab::Elastic::Helper).to receive(:default).and_return(helper)
allow(Search::ClusterHealthCheck::Elastic).to receive(:healthy?).and_return(false)
allow(::Gitlab::Elasticsearch::Logger).to receive(:build).and_return(logger)
allow(helper).to receive(:unsupported_version?).and_return(false)
allow(helper).to receive(:alias_exists?).and_return(true)
allow(helper).to receive_messages(unsupported_version?: false, alias_exists?: true)
end
it 'raises an error and does not execute migration' do
......@@ -76,8 +74,7 @@
before do
allow(Gitlab::Elastic::Helper).to receive(:default).and_return(helper)
allow(Search::ClusterHealthCheck::Elastic).to receive(:healthy?).and_return(false)
allow(helper).to receive(:unsupported_version?).and_return(false)
allow(helper).to receive(:alias_exists?).and_return(true)
allow(helper).to receive_messages(unsupported_version?: false, alias_exists?: true)
end
it 'returns without execution' do
......@@ -135,9 +132,7 @@
context 'when executing migration with retry_on_failure set' do
before do
allow(migration).to receive(:started?).and_return(true)
allow(migration).to receive(:retry_on_failure?).and_return(true)
allow(migration).to receive(:max_attempts).and_return(2)
allow(migration).to receive_messages(started?: true, retry_on_failure?: true, max_attempts: 2)
allow(migration).to receive(:migrate).and_raise(StandardError)
allow(::Gitlab::Elasticsearch::Logger).to receive(:build).and_return(logger)
end
......@@ -161,11 +156,9 @@
context 'for migration process' do
before do
allow(migration).to receive(:started?).and_return(started)
allow(migration).to receive(:completed?).and_return(completed)
allow(migration).to receive(:batched?).and_return(batched)
# retry_on_failure is tested in the context above
allow(migration).to receive(:retry_on_failure?).and_return(false)
allow(migration).to receive_messages(started?: started, completed?: completed, batched?: batched,
retry_on_failure?: false)
end
using RSpec::Parameterized::TableSyntax
......@@ -242,8 +235,7 @@
before do
allow(Gitlab::Elastic::Helper).to receive(:default).and_return(helper)
allow(migration).to receive(:space_requirements?).and_return(true)
allow(migration).to receive(:space_required_bytes).and_return(10)
allow(migration).to receive_messages(space_requirements?: true, space_required_bytes: 10)
end
it 'halts the migration if there is not enough space' do
......@@ -294,13 +286,10 @@
before do
allow(Gitlab::Elastic::Helper).to receive(:default).and_return(helper)
allow(Search::ClusterHealthCheck::Elastic).to receive(:healthy?).and_return(true)
allow(helper).to receive(:unsupported_version?).and_return(false)
allow(helper).to receive(:alias_exists?).and_return(true)
allow(helper).to receive_messages(unsupported_version?: false, alias_exists?: true)
allow(Elastic::MigrationRecord).to receive(:load_versions).and_return([])
allow(Elastic::DataMigrationService).to receive(:migrations).and_return([migration])
allow(migration).to receive(:space_requirements?).and_return(false)
allow(migration).to receive(:started?).and_return(false)
allow(migration).to receive(:batched?).and_return(false)
allow(migration).to receive_messages(space_requirements?: false, started?: false, batched?: false)
end
it 'executes the first migration' do
......
......@@ -2422,7 +2422,6 @@
- './ee/spec/workers/elastic_full_index_worker_spec.rb'
- './ee/spec/workers/elastic_indexing_control_worker_spec.rb'
- './ee/spec/workers/elastic_index_initial_bulk_cron_worker_spec.rb'
- './ee/spec/workers/elastic/migration_worker_spec.rb'
- './ee/spec/workers/elastic_namespace_indexer_worker_spec.rb'
- './ee/spec/workers/elastic_namespace_rollout_worker_spec.rb'
- './ee/spec/workers/elastic/project_transfer_worker_spec.rb'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment