diff --git a/app/models/namespace/aggregation_schedule.rb b/app/models/namespace/aggregation_schedule.rb index 6c977505f17ae85b77082820fe97c64a69a2f4b4..08187a9273e4266ec41e329388f453633a095903 100644 --- a/app/models/namespace/aggregation_schedule.rb +++ b/app/models/namespace/aggregation_schedule.rb @@ -13,11 +13,7 @@ class Namespace::AggregationSchedule < ApplicationRecord after_create :schedule_root_storage_statistics def default_lease_timeout - if Feature.enabled?(:reduce_aggregation_schedule_lease, namespace.root_ancestor) - ::Gitlab::CurrentSettings.namespace_aggregation_schedule_lease_duration_in_seconds - else - 30.minutes.to_i - end + ::Gitlab::CurrentSettings.namespace_aggregation_schedule_lease_duration_in_seconds end def schedule_root_storage_statistics diff --git a/config/feature_flags/development/reduce_aggregation_schedule_lease.yml b/config/feature_flags/development/reduce_aggregation_schedule_lease.yml deleted file mode 100644 index 2603b1ce07c48083acf6cce06d5c9ccc7cfe9535..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/reduce_aggregation_schedule_lease.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: reduce_aggregation_schedule_lease -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118472 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408463 -milestone: '16.0' -type: development -group: group::utilization -default_enabled: false diff --git a/spec/models/namespace/aggregation_schedule_spec.rb b/spec/models/namespace/aggregation_schedule_spec.rb index ea9dddf2513894cd2b4a6cb30e79ce8e550d7756..c05344ff72940cd2aad58a7d4cfbbdaf0df23254 100644 --- a/spec/models/namespace/aggregation_schedule_spec.rb +++ b/spec/models/namespace/aggregation_schedule_spec.rb @@ -16,21 +16,11 @@ aggregation_schedule.save! end - context 'when reduce_aggregation_schedule_lease FF is enabled' do - it 'returns namespace_aggregation_schedule_lease_duration value from Gitlabsettings' do - allow(::Gitlab::CurrentSettings).to receive(:namespace_aggregation_schedule_lease_duration_in_seconds) - .and_return(240) - stub_feature_flags(reduce_aggregation_schedule_lease: true) + it 'returns namespace_aggregation_schedule_lease_duration value from Gitlab CurrentSettings' do + allow(::Gitlab::CurrentSettings).to receive(:namespace_aggregation_schedule_lease_duration_in_seconds) + .and_return(240) - expect(aggregation_schedule.default_lease_timeout).to eq 4.minutes.to_i - end - end - - context 'when reduce_aggregation_schedule_lease FF is disabled' do - it 'is 30 minutes' do - stub_feature_flags(reduce_aggregation_schedule_lease: false) - expect(aggregation_schedule.default_lease_timeout).to eq 30.minutes.to_i - end + expect(aggregation_schedule.default_lease_timeout).to eq 4.minutes.to_i end end