diff options
author | Andrew Newdigate <andrew@gitlab.com> | 2017-09-27 19:28:36 +0100 |
---|---|---|
committer | Andrew Newdigate <andrew@gitlab.com> | 2017-09-27 19:28:36 +0100 |
commit | 121057c52b65b1ac53bebe62312485918bdd863a (patch) | |
tree | ab522facc8ebfcc8f0c2569eb791b70f31f9f94b | |
parent | a02881dfda8cc65cfa5f9eeeee5f2c24496cbb69 (diff) | |
download | gitlab-ce-an-repo-gitaly.tar.gz |
Rolling back change to n+1 detectionan-repo-gitaly
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 3f10951f49e..955d2307f88 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -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 |