diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-03-14 16:05:06 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-03-15 11:49:53 +0000 |
| commit | db908826656b78e099ab5e1d99d4524ad0751d13 (patch) | |
| tree | 211e9a9e39f50ccd08248d7248b1b5dd7368c9c4 | |
| parent | 6cd7f679d065e08f58d6dc9e2debf4f1a9cbcbe1 (diff) | |
| download | gitlab-ce-44191-reduce-redis-usage-from-merge-request-diffs-caching.tar.gz | |
Only cache MR diffs for one week44191-reduce-redis-usage-from-merge-request-diffs-caching
This may lead to some being evicted and having to be cached again, but many MRs
get closed or updated in that time anyway.
| -rw-r--r-- | lib/gitlab/diff/file_collection/merge_request_diff.rb | 2 | ||||
| -rw-r--r-- | spec/services/merge_requests/merge_request_diff_cache_service_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff.rb b/lib/gitlab/diff/file_collection/merge_request_diff.rb index 9c1f85c70d6..c358ae428cf 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff.rb @@ -72,7 +72,7 @@ module Gitlab end def store_highlight_cache - Rails.cache.write(cache_key, highlight_cache) if @highlight_cache_was_empty + Rails.cache.write(cache_key, highlight_cache, expires_in: 1.week) if @highlight_cache_was_empty end def cacheable?(diff_file) diff --git a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb index 33cba7225e3..57b6165cfb0 100644 --- a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb +++ b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb @@ -15,7 +15,7 @@ describe MergeRequests::MergeRequestDiffCacheService, :use_clean_rails_memory_st cache_key = new_diff.diffs.cache_key expect(Rails.cache).to receive(:read).with(cache_key).and_call_original - expect(Rails.cache).to receive(:write).with(cache_key, anything).and_call_original + expect(Rails.cache).to receive(:write).with(cache_key, anything, anything).and_call_original subject.execute(merge_request, new_diff) end @@ -31,7 +31,7 @@ describe MergeRequests::MergeRequestDiffCacheService, :use_clean_rails_memory_st expect(Rails.cache).to receive(:delete).with(old_cache_key).and_call_original expect(Rails.cache).to receive(:read).with(new_cache_key).and_call_original - expect(Rails.cache).to receive(:write).with(new_cache_key, anything).and_call_original + expect(Rails.cache).to receive(:write).with(new_cache_key, anything, anything).and_call_original subject.execute(merge_request, new_diff) end |