Read about our upcoming Code of Conduct on this issue

Commit 8b0417aa authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Merge branch 'sh-fix-issue-38646' into 'master'

Fix pushes to an empty repository not invalidating has_visible_content? cache

Closes #38646

See merge request gitlab-org/gitlab-ce!14613
......@@ -34,7 +34,10 @@ class Repository
CACHED_METHODS = %i(size commit_count rendered_readme contribution_guide
changelog license_blob license_key gitignore koding_yml
gitlab_ci_yml branch_names tag_names branch_count
tag_count avatar exists? empty? root_ref).freeze
tag_count avatar exists? empty? root_ref has_visible_content?).freeze
# Methods that use cache_method but only memoize the value
MEMOIZED_CACHED_METHODS = %i(license empty_repo?).freeze
# Certain method caches should be refreshed when certain types of files are
# changed. This Hash maps file types (as returned by Gitlab::FileDetector) to
......@@ -269,7 +272,7 @@ def expire_tags_cache
end
def expire_branches_cache
expire_method_caches(%i(branch_names branch_count))
expire_method_caches(%i(branch_names branch_count has_visible_content?))
@local_branches = nil
@branch_exists_memo = nil
end
......@@ -340,7 +343,7 @@ def expire_root_ref_cache
def expire_emptiness_caches
return unless empty?
expire_method_caches(%i(empty?))
expire_method_caches(%i(empty? has_visible_content?))
end
def lookup_cache
......
---
title: Fix pushes to an empty repository not invalidating has_visible_content? cache
merge_request:
author:
type: fixed
......@@ -1272,6 +1272,7 @@ def expect_to_raise_storage_error
allow(repository).to receive(:empty?).and_return(true)
expect(cache).to receive(:expire).with(:empty?)
expect(cache).to receive(:expire).with(:has_visible_content?)
repository.expire_emptiness_caches
end
......@@ -1280,6 +1281,7 @@ def expect_to_raise_storage_error
allow(repository).to receive(:empty?).and_return(false)
expect(cache).not_to receive(:expire).with(:empty?)
expect(cache).not_to receive(:expire).with(:has_visible_content?)
repository.expire_emptiness_caches
end
......@@ -1609,7 +1611,7 @@ def merge(repository, user, merge_request, message)
describe '#expire_branches_cache' do
it 'expires the cache' do
expect(repository).to receive(:expire_method_caches)
.with(%i(branch_names branch_count))
.with(%i(branch_names branch_count has_visible_content?))
.and_call_original
repository.expire_branches_cache
......@@ -1888,6 +1890,15 @@ def merge(repository, user, merge_request, message)
repository.expire_all_method_caches
end
it 'all cache_method definitions are in the lists of method caches' do
methods = repository.methods.map do |method|
match = /^_uncached_(.*)/.match(method)
match[1].to_sym if match
end.compact
expect(methods).to match_array(Repository::CACHED_METHODS + Repository::MEMOIZED_CACHED_METHODS)
end
end
describe '#file_on_head' 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