From 121057c52b65b1ac53bebe62312485918bdd863a Mon Sep 17 00:00:00 2001 From: Andrew Newdigate Date: Wed, 27 Sep 2017 19:28:36 +0100 Subject: [PATCH] Rolling back change to n+1 detection --- lib/gitlab/gitaly_client.rb | 8 +------- 1 file changed, 1 insertion(+), 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