b4ee6f57b9
This greatly improves the performance of Project#external_issue_tracker
by moving most of the fields queried in Ruby to the database and letting
the database handle all logic. Prior to this change the process of
finding an external issue tracker was along the lines of the following:
1. Load all project services into memory.
2. Reduce the list to only services where "issue_tracker?" returns true
3. Reduce the list from step 2 to service where "default?" returns false
4. Find the first service where "activated?" returns true
This has to two big problems:
1. Loading all services into memory only to reduce the list down to a
single item later on is a waste of memory (and slow timing wise).
2. Calling Array#select followed by Array#reject followed by Array#find
allocates extra objects when this really isn't needed.
To work around this the following service fields have been moved to the
database (instead of being hardcoded):
* category
* default
This in turn means we can get the external issue tracker using the
following query:
SELECT *
FROM services
WHERE active IS TRUE
AND default IS FALSE
AND category = 'issue_tracker'
AND project_id = XXX
LIMIT 1
This coupled with memoizing the result (just as before this commit)
greatly reduces the time it takes for Project#external_issue_tracker to
complete. The exact reduction depends on one's environment, but locally
the execution time is reduced from roughly 230 ms to only 2 ms (= a
reduction of almost 180x).
Fixes gitlab-org/gitlab-ce#10771
119 lines
3.1 KiB
Ruby
119 lines
3.1 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: services
|
|
#
|
|
# id :integer not null, primary key
|
|
# type :string(255)
|
|
# title :string(255)
|
|
# project_id :integer
|
|
# created_at :datetime
|
|
# updated_at :datetime
|
|
# active :boolean default(FALSE), not null
|
|
# properties :text
|
|
# template :boolean default(FALSE)
|
|
# push_events :boolean default(TRUE)
|
|
# issues_events :boolean default(TRUE)
|
|
# merge_requests_events :boolean default(TRUE)
|
|
# tag_push_events :boolean default(TRUE)
|
|
# note_events :boolean default(TRUE), not null
|
|
# build_events :boolean default(FALSE), not null
|
|
#
|
|
|
|
class IssueTrackerService < Service
|
|
|
|
validates :project_url, :issues_url, :new_issue_url, presence: true, if: :activated?
|
|
|
|
default_value_for :category, 'issue_tracker'
|
|
|
|
def default?
|
|
default
|
|
end
|
|
|
|
def issue_url(iid)
|
|
self.issues_url.gsub(':id', iid.to_s)
|
|
end
|
|
|
|
def project_path
|
|
project_url
|
|
end
|
|
|
|
def new_issue_path
|
|
new_issue_url
|
|
end
|
|
|
|
def issue_path(iid)
|
|
issue_url(iid)
|
|
end
|
|
|
|
def fields
|
|
[
|
|
{ type: 'text', name: 'description', placeholder: description },
|
|
{ type: 'text', name: 'project_url', placeholder: 'Project url' },
|
|
{ type: 'text', name: 'issues_url', placeholder: 'Issue url' },
|
|
{ type: 'text', name: 'new_issue_url', placeholder: 'New Issue url' }
|
|
]
|
|
end
|
|
|
|
def initialize_properties
|
|
if properties.nil?
|
|
if enabled_in_gitlab_config
|
|
self.properties = {
|
|
title: issues_tracker['title'],
|
|
project_url: add_issues_tracker_id(issues_tracker['project_url']),
|
|
issues_url: add_issues_tracker_id(issues_tracker['issues_url']),
|
|
new_issue_url: add_issues_tracker_id(issues_tracker['new_issue_url'])
|
|
}
|
|
else
|
|
self.properties = {}
|
|
end
|
|
end
|
|
end
|
|
|
|
def supported_events
|
|
%w(push)
|
|
end
|
|
|
|
def execute(data)
|
|
return unless supported_events.include?(data[:object_kind])
|
|
|
|
message = "#{self.type} was unable to reach #{self.project_url}. Check the url and try again."
|
|
result = false
|
|
|
|
begin
|
|
response = HTTParty.head(self.project_url, verify: true)
|
|
|
|
if response
|
|
message = "#{self.type} received response #{response.code} when attempting to connect to #{self.project_url}"
|
|
result = true
|
|
end
|
|
rescue HTTParty::Error, Timeout::Error, SocketError, Errno::ECONNRESET, Errno::ECONNREFUSED => error
|
|
message = "#{self.type} had an error when trying to connect to #{self.project_url}: #{error.message}"
|
|
end
|
|
Rails.logger.info(message)
|
|
result
|
|
end
|
|
|
|
private
|
|
|
|
def enabled_in_gitlab_config
|
|
Gitlab.config.issues_tracker &&
|
|
Gitlab.config.issues_tracker.values.any? &&
|
|
issues_tracker
|
|
end
|
|
|
|
def issues_tracker
|
|
Gitlab.config.issues_tracker[to_param]
|
|
end
|
|
|
|
def add_issues_tracker_id(url)
|
|
if self.project
|
|
id = self.project.issues_tracker_id
|
|
|
|
if id
|
|
url = url.gsub(":issues_tracker_id", id)
|
|
end
|
|
end
|
|
|
|
url
|
|
end
|
|
end
|