Commit 1895f8d9 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'less-reactivecaching-for-environments' into 'master'

Stop ReactiveCaching from needless Environment refreshes

See merge request gitlab-org/gitlab!20186
parents 1cecd5ab 4692abaa
...@@ -4,6 +4,9 @@ class Environment < ApplicationRecord ...@@ -4,6 +4,9 @@ class Environment < ApplicationRecord
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
include ReactiveCaching include ReactiveCaching
self.reactive_cache_refresh_interval = 1.minute
self.reactive_cache_lifetime = 55.seconds
belongs_to :project, required: true belongs_to :project, required: true
has_many :deployments, -> { visible }, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :deployments, -> { visible }, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
......
...@@ -744,6 +744,12 @@ describe Environment, :use_clean_rails_memory_store_caching do ...@@ -744,6 +744,12 @@ describe Environment, :use_clean_rails_memory_store_caching do
allow(environment).to receive(:deployment_platform).and_return(double) allow(environment).to receive(:deployment_platform).and_return(double)
end end
context 'reactive cache configuration' do
it 'does not continue to spawn jobs' do
expect(described_class.reactive_cache_lifetime).to be < described_class.reactive_cache_refresh_interval
end
end
context 'reactive cache is empty' do context 'reactive cache is empty' do
before do before do
stub_reactive_cache(environment, nil) stub_reactive_cache(environment, nil)
......
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