Resolve Gitaly N+1 for CI/CD environments statuses

This commit is contained in:
Grzegorz Bizon 2019-07-10 16:32:08 +02:00
parent 49f8697a49
commit af0c054c6d
2 changed files with 3 additions and 4 deletions

View File

@ -1914,9 +1914,8 @@ class Project < ApplicationRecord
@route_maps_by_commit ||= Hash.new do |h, sha|
h[sha] = begin
data = repository.route_map_for(sha)
next unless data
Gitlab::RouteMap.new(data)
Gitlab::RouteMap.new(data) if data
rescue Gitlab::RouteMap::FormatError
nil
end

View File

@ -922,7 +922,7 @@ describe Projects::MergeRequestsController do
expect(merge_request).to be_present
expect { get_ci_environments_status }
.not_to change { Gitlab::GitalyClient.get_request_count }
.to change { Gitlab::GitalyClient.get_request_count }.by_at_most(1)
end
end
@ -937,7 +937,7 @@ describe Projects::MergeRequestsController do
expect(merge_request.merge_request_diff.merge_request_diff_files).to be_many
expect { get_ci_environments_status }
.not_to change { Gitlab::GitalyClient.get_request_count }
.to change { Gitlab::GitalyClient.get_request_count }.by_at_most(1)
end
end
end