diff --git a/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml b/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml index 3eb3f299d83f7a85e228f030e828178f69c008f7..68f450a1bbf902affa9269d32db3f6c80d872888 100644 --- a/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml +++ b/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml @@ -75,7 +75,6 @@ SidekiqLoadBalancing/WorkerDataConsistency: - 'app/workers/expire_build_artifacts_worker.rb' - 'app/workers/export_csv_worker.rb' - 'app/workers/file_hook_worker.rb' - - 'app/workers/flush_counter_increments_worker.rb' - 'app/workers/gitlab/github_gists_import/finish_import_worker.rb' - 'app/workers/gitlab/github_gists_import/import_gist_worker.rb' - 'app/workers/gitlab/github_gists_import/start_import_worker.rb' @@ -238,7 +237,6 @@ SidekiqLoadBalancing/WorkerDataConsistency: - 'app/workers/users/unconfirmed_secondary_emails_deletion_cron_worker.rb' - 'app/workers/wait_for_cluster_creation_worker.rb' - 'app/workers/web_hooks/log_destroy_worker.rb' - - 'app/workers/web_hooks/log_execution_worker.rb' - 'app/workers/work_items/import_work_items_csv_worker.rb' - 'app/workers/x509_certificate_revoke_worker.rb' - 'app/workers/x509_issuer_crl_check_worker.rb' diff --git a/app/workers/flush_counter_increments_worker.rb b/app/workers/flush_counter_increments_worker.rb index dcf681fa0b856ad550840ce25f9ac5312afca8cc..105070c333a85cf7a1b88990a832ac1196895b5e 100644 --- a/app/workers/flush_counter_increments_worker.rb +++ b/app/workers/flush_counter_increments_worker.rb @@ -8,7 +8,7 @@ class FlushCounterIncrementsWorker include ApplicationWorker - data_consistency :delayed, feature_flag: :load_balancing_for_flush_counter_increments_worker + data_consistency :delayed sidekiq_options retry: 3 loggable_arguments 0, 2 diff --git a/app/workers/web_hooks/log_execution_worker.rb b/app/workers/web_hooks/log_execution_worker.rb index c6941e6ba0e03d8b14dfe539babf112448e9904f..e2204fc034d81565df2379e33df6e63a365d46ef 100644 --- a/app/workers/web_hooks/log_execution_worker.rb +++ b/app/workers/web_hooks/log_execution_worker.rb @@ -4,7 +4,7 @@ module WebHooks class LogExecutionWorker include ApplicationWorker - data_consistency :delayed, feature_flag: :load_balancing_for_web_hooks_log_execution_worker + data_consistency :delayed feature_category :webhooks urgency :low sidekiq_options retry: 3 diff --git a/config/feature_flags/worker/load_balancing_for_flush_counter_increments_worker.yml b/config/feature_flags/worker/load_balancing_for_flush_counter_increments_worker.yml deleted file mode 100644 index 59687c9897ab4b24cf017bd613d33cf9d3ebfb96..0000000000000000000000000000000000000000 --- a/config/feature_flags/worker/load_balancing_for_flush_counter_increments_worker.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: load_balancing_for_flush_counter_increments_worker -feature_issue_url: https://gitlab.com/gitlab-com/gl-infra/data-access/durability/team/-/issues/121 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186079 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/527277 -milestone: '17.11' -group: group::durability -type: worker -default_enabled: false diff --git a/config/feature_flags/worker/load_balancing_for_web_hooks_log_execution_worker.yml b/config/feature_flags/worker/load_balancing_for_web_hooks_log_execution_worker.yml deleted file mode 100644 index 012394fd02b4ae97ef996770b7e4bd0833bc6520..0000000000000000000000000000000000000000 --- a/config/feature_flags/worker/load_balancing_for_web_hooks_log_execution_worker.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: load_balancing_for_web_hooks_log_execution_worker -feature_issue_url: https://gitlab.com/gitlab-com/gl-infra/data-access/durability/team/-/issues/121 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186079 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/527276 -milestone: '17.11' -group: group::durability -type: worker -default_enabled: false diff --git a/spec/workers/flush_counter_increments_worker_spec.rb b/spec/workers/flush_counter_increments_worker_spec.rb index 1bdda3100c9eb07fad9cdb0f50a33a0a2a78960a..40c1445bf2c03ac742d9de18a15312b094ebf02b 100644 --- a/spec/workers/flush_counter_increments_worker_spec.rb +++ b/spec/workers/flush_counter_increments_worker_spec.rb @@ -6,6 +6,8 @@ let(:project_statistics) { create(:project_statistics) } let(:model) { CounterAttributeModel.find(project_statistics.id) } + it_behaves_like 'worker with data consistency', described_class, data_consistency: :delayed + describe '#perform', :redis do let(:attribute) { model.class.counter_attributes.first } let(:worker) { described_class.new } diff --git a/spec/workers/web_hooks/log_execution_worker_spec.rb b/spec/workers/web_hooks/log_execution_worker_spec.rb new file mode 100644 index 0000000000000000000000000000000000000000..73eb61b5a8939a15cdf9e2ed53325923f6086ced --- /dev/null +++ b/spec/workers/web_hooks/log_execution_worker_spec.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe WebHooks::LogExecutionWorker, feature_category: :webhooks do + it_behaves_like 'worker with data consistency', described_class, data_consistency: :delayed +end