Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7ee8771c
Commit
7ee8771c
authored
Oct 03, 2018
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't build project services unneccesarily
parent
1973d0c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
29 deletions
+52
-29
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-2
app/models/project.rb
app/models/project.rb
+17
-18
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+19
-9
spec/models/project_spec.rb
spec/models/project_spec.rb
+14
-0
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
7ee8771c
...
@@ -207,7 +207,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
...
@@ -207,7 +207,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
environments
=
environments
=
begin
begin
@merge_request
.
environments_for
(
current_user
).
map
do
|
environment
|
@merge_request
.
environments_for
(
current_user
).
map
do
|
environment
|
project
=
environment
.
project
project
=
environment
.
project
deployment
=
environment
.
first_deployment_for
(
@merge_request
.
diff_head_sha
)
deployment
=
environment
.
first_deployment_for
(
@merge_request
.
diff_head_sha
)
stop_url
=
stop_url
=
...
@@ -217,7 +217,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
...
@@ -217,7 +217,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
metrics_url
=
metrics_url
=
if
can?
(
current_user
,
:read_environment
,
environment
)
&&
environment
.
has_metrics?
if
can?
(
current_user
,
:read_environment
,
environment
)
&&
environment
.
has_metrics?
metrics_project_environment_deployment_path
(
environment
.
project
,
environment
,
deployment
)
metrics_project_environment_deployment_path
(
project
,
environment
,
deployment
)
end
end
metrics_monitoring_url
=
metrics_monitoring_url
=
...
...
app/models/project.rb
View file @
7ee8771c
...
@@ -1082,26 +1082,10 @@ class Project < ActiveRecord::Base
...
@@ -1082,26 +1082,10 @@ class Project < ActiveRecord::Base
end
end
def
find_or_initialize_services
(
exceptions:
[])
def
find_or_initialize_services
(
exceptions:
[])
services_templates
=
Service
.
where
(
template:
true
)
available_services_names
=
Service
.
available_services_names
-
exceptions
available_services_names
=
Service
.
available_services_names
-
exceptions
available_services
=
available_services_names
.
map
do
|
service_name
|
available_services
=
available_services_names
.
map
do
|
service_name
|
service
=
find_service
(
services
,
service_name
)
find_or_initialize_service
(
service_name
)
if
service
service
else
# We should check if template for the service exists
template
=
find_service
(
services_templates
,
service_name
)
if
template
.
nil?
# If no template, we should create an instance. Ex `build_gitlab_ci_service`
public_send
(
"build_
#{
service_name
}
_service"
)
# rubocop:disable GitlabSecurity/PublicSend
else
Service
.
build_from_template
(
id
,
template
)
end
end
end
end
available_services
.
reject
do
|
service
|
available_services
.
reject
do
|
service
|
...
@@ -1114,7 +1098,18 @@ class Project < ActiveRecord::Base
...
@@ -1114,7 +1098,18 @@ class Project < ActiveRecord::Base
end
end
def
find_or_initialize_service
(
name
)
def
find_or_initialize_service
(
name
)
find_or_initialize_services
.
find
{
|
service
|
service
.
to_param
==
name
}
service
=
find_service
(
services
,
name
)
return
service
if
service
# We should check if template for the service exists
template
=
find_service
(
services_templates
,
name
)
if
template
Service
.
build_from_template
(
id
,
template
)
else
# If no template, we should create an instance. Ex `build_gitlab_ci_service`
public_send
(
"build_
#{
name
}
_service"
)
# rubocop:disable GitlabSecurity/PublicSend
end
end
end
# rubocop: disable CodeReuse/ServiceClass
# rubocop: disable CodeReuse/ServiceClass
...
@@ -2277,4 +2272,8 @@ class Project < ActiveRecord::Base
...
@@ -2277,4 +2272,8 @@ class Project < ActiveRecord::Base
check_access
.
call
check_access
.
call
end
end
end
end
def
services_templates
@services_templates
||=
Service
.
where
(
template:
true
)
end
end
end
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
7ee8771c
...
@@ -763,25 +763,35 @@ describe Projects::MergeRequestsController do
...
@@ -763,25 +763,35 @@ describe Projects::MergeRequestsController do
describe
'GET ci_environments_status'
do
describe
'GET ci_environments_status'
do
context
'the environment is from a forked project'
do
context
'the environment is from a forked project'
do
let!
(
:forked
)
{
fork_project
(
project
,
user
,
repository:
true
)
}
let!
(
:forked
)
{
fork_project
(
project
,
user
,
repository:
true
)
}
let!
(
:environment
)
{
create
(
:environment
,
project:
forked
)
}
let!
(
:environment
)
{
create
(
:environment
,
project:
forked
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
environment:
environment
,
sha:
forked
.
commit
.
id
,
ref:
'master'
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
environment:
environment
,
sha:
forked
.
commit
.
id
,
ref:
'master'
)
}
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:merge_request
)
do
let
(
:merge_request
)
do
create
(
:merge_request
,
source_project:
forked
,
target_project:
project
)
create
(
:merge_request
,
source_project:
forked
,
target_project:
project
)
end
end
before
do
it
'links to the environment on that project'
do
get_ci_environments_status
expect
(
json_response
.
first
[
'url'
]).
to
match
/
#{
forked
.
full_path
}
/
end
# we're trying to reduce the overall number of queries for this method.
# set a hard limit for now. https://gitlab.com/gitlab-org/gitlab-ce/issues/43109
it
'keeps queries in check'
do
control_count
=
ActiveRecord
::
QueryRecorder
.
new
{
get_ci_environments_status
}.
count
expect
(
control_count
).
to
be
<=
137
end
def
get_ci_environments_status
get
:ci_environments_status
,
get
:ci_environments_status
,
namespace_id:
merge_request
.
project
.
namespace
.
to_param
,
namespace_id:
merge_request
.
project
.
namespace
.
to_param
,
project_id:
merge_request
.
project
,
project_id:
merge_request
.
project
,
id:
merge_request
.
iid
,
format:
'json'
id:
merge_request
.
iid
,
format:
'json'
end
end
it
'links to the environment on that project'
do
expect
(
json_response
.
first
[
'url'
]).
to
match
/
#{
forked
.
full_path
}
/
end
end
end
end
end
...
...
spec/models/project_spec.rb
View file @
7ee8771c
...
@@ -4037,6 +4037,20 @@ describe Project do
...
@@ -4037,6 +4037,20 @@ describe Project do
expect
(
result
).
to
be_empty
expect
(
result
).
to
be_empty
end
end
end
end
describe
"#find_or_initialize_service"
do
subject
{
build
(
:project
)
}
it
'avoids N+1 database queries'
do
allow
(
Service
).
to
receive
(
:available_services_names
).
and_return
(
%w(prometheus pushover)
)
control_count
=
ActiveRecord
::
QueryRecorder
.
new
{
project
.
find_or_initialize_service
(
'prometheus'
)
}.
count
allow
(
Service
).
to
receive
(
:available_services_names
).
and_call_original
expect
{
project
.
find_or_initialize_service
(
'prometheus'
)
}.
not_to
exceed_query_limit
(
control_count
)
end
end
end
end
def
rugged_config
def
rugged_config
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment