Commit c3450ab9 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'reactive-caching-alive-bug' into 'master'

ReactiveCaching#clear_reactive_cache! should not keep the cache alive

See merge request gitlab-org/gitlab-ce!19311
parents 72702275 2535834f
...@@ -74,6 +74,7 @@ module ReactiveCaching ...@@ -74,6 +74,7 @@ module ReactiveCaching
def clear_reactive_cache!(*args) def clear_reactive_cache!(*args)
Rails.cache.delete(full_reactive_cache_key(*args)) Rails.cache.delete(full_reactive_cache_key(*args))
Rails.cache.delete(alive_reactive_cache_key(*args))
end end
def exclusively_update_reactive_cache!(*args) def exclusively_update_reactive_cache!(*args)
......
---
title: Updates ReactiveCaching clear_reactive_caching method to clear both data and
alive caching
merge_request: 19311
author:
type: fixed
...@@ -94,6 +94,7 @@ describe ReactiveCaching, :use_clean_rails_memory_store_caching do ...@@ -94,6 +94,7 @@ describe ReactiveCaching, :use_clean_rails_memory_store_caching do
end end
it { expect(instance.result).to be_nil } it { expect(instance.result).to be_nil }
it { expect(reactive_cache_alive?(instance)).to be_falsy }
end end
describe '#exclusively_update_reactive_cache!' do describe '#exclusively_update_reactive_cache!' do
......
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