From ebb05430613f88f8a5565067703a1d697fa3f22c Mon Sep 17 00:00:00 2001 From: Erick Bajao Date: Fri, 8 Apr 2022 17:13:29 +0800 Subject: [PATCH] Remove projects_build_artifacts_size_refresh flags Remove the feature flags. We settle with a default of 10. Also, introduce ops flag to allow disabling stats refresh when needed. Changelog: changed --- ..._build_artifacts_size_statistics_worker.rb | 12 ++------- ...ects_build_artifacts_size_refresh_high.yml | 8 ------ ...jects_build_artifacts_size_refresh_low.yml | 8 ------ ...ts_build_artifacts_size_refresh_medium.yml | 8 ------ .../projects_build_artifacts_size_refresh.yml | 8 ++++++ ...d_artifacts_size_statistics_worker_spec.rb | 27 +++---------------- 6 files changed, 13 insertions(+), 58 deletions(-) delete mode 100644 config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml delete mode 100644 config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml delete mode 100644 config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml create mode 100644 config/feature_flags/ops/projects_build_artifacts_size_refresh.yml diff --git a/app/workers/projects/refresh_build_artifacts_size_statistics_worker.rb b/app/workers/projects/refresh_build_artifacts_size_statistics_worker.rb index a91af72cc2ca7d..705bf0534f74ed 100644 --- a/app/workers/projects/refresh_build_artifacts_size_statistics_worker.rb +++ b/app/workers/projects/refresh_build_artifacts_size_statistics_worker.rb @@ -5,10 +5,6 @@ class RefreshBuildArtifactsSizeStatisticsWorker include ApplicationWorker include LimitedCapacity::Worker - MAX_RUNNING_LOW = 2 - MAX_RUNNING_MEDIUM = 20 - MAX_RUNNING_HIGH = 50 - data_consistency :always feature_category :build_artifacts @@ -37,12 +33,8 @@ def remaining_work_count(*args) end def max_running_jobs - if ::Feature.enabled?(:projects_build_artifacts_size_refresh_high) - MAX_RUNNING_HIGH - elsif ::Feature.enabled?(:projects_build_artifacts_size_refresh_medium) - MAX_RUNNING_MEDIUM - elsif ::Feature.enabled?(:projects_build_artifacts_size_refresh_low) - MAX_RUNNING_LOW + if ::Feature.enabled?(:projects_build_artifacts_size_refresh, type: :ops) + 10 else 0 end diff --git a/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml deleted file mode 100644 index 77b5feafd6ab98..00000000000000 --- a/config/feature_flags/development/projects_build_artifacts_size_refresh_high.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: projects_build_artifacts_size_refresh_high -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018 -milestone: '14.9' -type: development -group: group::pipeline insights -default_enabled: false diff --git a/config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml deleted file mode 100644 index cefecb245e307d..00000000000000 --- a/config/feature_flags/development/projects_build_artifacts_size_refresh_low.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: projects_build_artifacts_size_refresh_low -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018 -milestone: '14.9' -type: development -group: group::pipeline insights -default_enabled: false diff --git a/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml b/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml deleted file mode 100644 index caeb664778208d..00000000000000 --- a/config/feature_flags/development/projects_build_artifacts_size_refresh_medium.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: projects_build_artifacts_size_refresh_medium -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356018 -milestone: '14.9' -type: development -group: group::pipeline insights -default_enabled: false diff --git a/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml b/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml new file mode 100644 index 00000000000000..8b54a0e3ff5aaa --- /dev/null +++ b/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml @@ -0,0 +1,8 @@ +--- +name: projects_build_artifacts_size_refresh +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84701 +rollout_issue_url: +milestone: '15.1' +type: ops +group: group::pipeline insights +default_enabled: true diff --git a/spec/workers/projects/refresh_build_artifacts_size_statistics_worker_spec.rb b/spec/workers/projects/refresh_build_artifacts_size_statistics_worker_spec.rb index 4a6a525a5a7fb9..c7e45e7e4d7fac 100644 --- a/spec/workers/projects/refresh_build_artifacts_size_statistics_worker_spec.rb +++ b/spec/workers/projects/refresh_build_artifacts_size_statistics_worker_spec.rb @@ -62,32 +62,11 @@ describe '#max_running_jobs' do subject { worker.max_running_jobs } - context 'when all projects_build_artifacts_size_refresh flags are enabled' do - it { is_expected.to eq(described_class::MAX_RUNNING_HIGH) } - end - - context 'when projects_build_artifacts_size_refresh_high flags is disabled' do - before do - stub_feature_flags(projects_build_artifacts_size_refresh_high: false) - end - - it { is_expected.to eq(described_class::MAX_RUNNING_MEDIUM) } - end - - context 'when projects_build_artifacts_size_refresh_high and projects_build_artifacts_size_refresh_medium flags are disabled' do - before do - stub_feature_flags(projects_build_artifacts_size_refresh_high: false) - stub_feature_flags(projects_build_artifacts_size_refresh_medium: false) - end - - it { is_expected.to eq(described_class::MAX_RUNNING_LOW) } - end + it { is_expected.to eq(10) } - context 'when all projects_build_artifacts_size_refresh flags are disabled' do + context 'when projects_build_artifacts_size_refresh flag is disabled' do before do - stub_feature_flags(projects_build_artifacts_size_refresh_low: false) - stub_feature_flags(projects_build_artifacts_size_refresh_medium: false) - stub_feature_flags(projects_build_artifacts_size_refresh_high: false) + stub_feature_flags(projects_build_artifacts_size_refresh: false) end it { is_expected.to eq(0) } -- GitLab