diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-10-10 00:11:57 +0100 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2017-10-10 00:11:57 +0100 |
| commit | 5bc49973c9367fd78f4b059b9268995c4935e2bc (patch) | |
| tree | 701976460a98b898300233ba5e45e71943b8e7c5 | |
| parent | 41578b72b727f5500bb778ed5c157ff73a4e6e58 (diff) | |
| download | gitlab-ce-5bc49973c9367fd78f4b059b9268995c4935e2bc.tar.gz | |
Experimental to find all tests that fail due to n+1 errors
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index cf36106e23d..e89d8ce3d65 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -17,7 +17,7 @@ module Gitlab @call_site = call_site @invocation_count = invocation_count @max_call_stack = max_call_stack - stacks = most_invoked_stack.join('\n') if most_invoked_stack + stacks = most_invoked_stack.join("\n") if most_invoked_stack msg = "GitalyClient##{call_site} called #{invocation_count} times from single request. Potential n+1?" msg << "\nThe following call site called into Gitaly #{max_call_stack} times:\n#{stacks}\n" if stacks @@ -172,7 +172,7 @@ module Gitlab # Check if this call is nested within a allow_n_plus_1_calls # block and skip check if it is - return if get_call_count(:gitaly_call_count_exception_block_depth) > 0 + # return if get_call_count(:gitaly_call_count_exception_block_depth) > 0 # This is the count of calls outside of a `allow_n_plus_1_calls` block # It is used for enforcement but not statistics @@ -263,7 +263,13 @@ module Gitlab def self.count_stack return unless RequestStore.active? - stack_string = caller.drop(1).join("\n") + s = caller.drop(1) + xx = s.find_index { |x| x.include? "allow_n_plus_1_calls" } + if xx then + stack_string = s[xx + 1] + else + stack_string = s.select{ |x| !x.include? "/gems/" }.join("\n") + end RequestStore.store[:stack_counter] ||= Hash.new |