Merge branch 'vij-remove-lease-ff' into 'master'

Removes reduce_aggregation_schedule_lease FF

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127846



Merged-by: Marc Shaw <mshaw@gitlab.com>
Approved-by: Marc Shaw <mshaw@gitlab.com>
Approved-by: Mohamed Hamda <mhamda@gitlab.com>
Reviewed-by: Mohamed Hamda <mhamda@gitlab.com>
Co-authored-by: Vijay Hawoldar <vhawoldar@gitlab.com>

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

config/feature_flags/development/reduce_aggregation_schedule_lease.yml

----
-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

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