kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'an-repo-gitaly' into 'zj-repo-gitaly'

Browse source 
Rolling back change to n+1 detection

See merge request gitlab-org/gitlab-ce!14536
This commit is contained in:
Alejandro Rodríguez 2017-09-27 20:27:54 +00:00
commit 412845f8de
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/gitlab/gitaly_client.rb
View file

@ -165,13 +165,7 @@ module Gitlab
return if permitted_call_count <= MAXIMUM_GITALY_CALLS
# We've exceeded the limit, but we may still be in the presence of a non
# n+1 but still complex request with many distinct calls. If the maximum
# call count is 1 or less that's probably the case.
max_count = max_call_count
return if max_count <= 1
raise TooManyInvocationsError.new(call_site, actual_call_count, max_count, max_stacks)
raise TooManyInvocationsError.new(call_site, actual_call_count, max_call_count, max_stacks)
end
def self.allow_n_plus_1_calls