Commit e095507c authored by Michael Kozono's avatar Michael Kozono

Merge branch '322628/rollout_secondary_usage_data_collection' into 'master'

Remove feature flag secondary_usage_data_collection [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!56678
parents 56139a7a d3f4696b
...@@ -13,7 +13,6 @@ module Geo ...@@ -13,7 +13,6 @@ module Geo
def perform def perform
return unless Gitlab::Geo.secondary? return unless Gitlab::Geo.secondary?
return unless Feature.enabled?(:geo_secondary_usage_data_collection)
try_obtain_lease do try_obtain_lease do
SecondaryUsageData.update_metrics! SecondaryUsageData.update_metrics!
......
---
title: Add git fetch counts for geo secondaries to usage ping
merge_request: 56678
author:
type: added
---
name: geo_secondary_usage_data_collection
introduced_by_url:
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322628
milestone: '13.10'
type: development
group: group::geo
default_enabled: false
...@@ -32,7 +32,7 @@ RSpec.describe Geo::SecondaryUsageDataCronWorker, :clean_gitlab_redis_shared_sta ...@@ -32,7 +32,7 @@ RSpec.describe Geo::SecondaryUsageDataCronWorker, :clean_gitlab_redis_shared_sta
subject.perform subject.perform
end end
it "does not update metrics if it doesn't obtain the lease" do it 'does not update metrics if it does not obtain the lease' do
expect(subject).to receive(:try_obtain_lease).and_return(false) expect(subject).to receive(:try_obtain_lease).and_return(false)
expect(Geo::SecondaryUsageData).not_to receive(:update_metrics!) expect(Geo::SecondaryUsageData).not_to receive(:update_metrics!)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment