summaryrefslogtreecommitdiff
path: root/app/models/network
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-02-22 14:51:27 +0000
committerJames Lopez <james@gitlab.com>2019-02-22 14:51:27 +0000
commitc00a1ec093367b0a56b1085a119e776f503bed02 (patch)
treeb044791423842447018f8d573e7a584142059fee /app/models/network
parentb569e76c15af91d3cf953394428a50662287a16a (diff)
downloadgitlab-ce-c00a1ec093367b0a56b1085a119e776f503bed02.tar.gz
Only allow 30 RPCs per test case to Gitaly
Prior to this change, 35 Gitaly RPCs were allowed. But recently there's been a renewed interest in performance. By lowering the number of calls new N + 1's will pop up. Later commits will add blocks to ignore the raised errors, followed by an issue for each to be fixed.
Diffstat (limited to 'app/models/network')
-rw-r--r--app/models/network/graph.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 6da3bb7bfb7..ecbeb24ee0a 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -40,9 +40,12 @@ module Network
# Get commits from repository
#
def collect_commits
- find_commits(count_to_display_commit_in_center).map do |commit|
- # Decorate with app/model/network/commit.rb
- Network::Commit.new(commit)
+ # https://gitlab.com/gitlab-org/gitlab-ce/issues/58013
+ Gitlab::GitalyClient.allow_n_plus_1_calls do
+ find_commits(count_to_display_commit_in_center).map do |commit|
+ # Decorate with app/model/network/commit.rb
+ Network::Commit.new(commit)
+ end
end
end