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
7266c032
Commit
7266c032
authored
Apr 12, 2021
by
Arturo Herrero
Committed by
Bob Van Landuyt
Apr 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix N+1 queries to find or initialize services
parent
9965db91
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
15 deletions
+37
-15
app/models/project.rb
app/models/project.rb
+5
-1
changelogs/unreleased/326209-fix-find-or-initialize-service-n-1.yml
.../unreleased/326209-fix-find-or-initialize-service-n-1.yml
+5
-0
spec/models/project_spec.rb
spec/models/project_spec.rb
+25
-7
spec/services/projects/create_service_spec.rb
spec/services/projects/create_service_spec.rb
+1
-3
spec/workers/projects/post_creation_worker_spec.rb
spec/workers/projects/post_creation_worker_spec.rb
+1
-4
No files found.
app/models/project.rb
View file @
7266c032
...
...
@@ -1378,7 +1378,7 @@ class Project < ApplicationRecord
def
find_or_initialize_service
(
name
)
return
if
disabled_services
.
include?
(
name
)
find_service
(
services
,
name
)
||
build_from_instance_or_template
(
name
)
||
public_send
(
"build_
#{
name
}
_service"
)
# rubocop:disable GitlabSecurity/PublicSend
find_service
(
services
,
name
)
||
build_from_instance_or_template
(
name
)
||
build_service
(
name
)
end
# rubocop: disable CodeReuse/ServiceClass
...
...
@@ -2591,6 +2591,10 @@ class Project < ApplicationRecord
return
Service
.
build_from_integration
(
template
,
project_id:
id
)
if
template
end
def
build_service
(
name
)
"
#{
name
}
_service"
.
classify
.
constantize
.
new
(
project_id:
id
)
end
def
services_templates
@services_templates
||=
Service
.
for_template
end
...
...
changelogs/unreleased/326209-fix-find-or-initialize-service-n-1.yml
0 → 100644
View file @
7266c032
---
title
:
Fix N+1 queries to find or initialize services
merge_request
:
58879
author
:
type
:
performance
spec/models/project_spec.rb
View file @
7266c032
...
...
@@ -5673,18 +5673,36 @@ RSpec.describe Project, factory_default: :keep do
end
describe
'#find_or_initialize_services'
do
let_it_be
(
:subject
)
{
create
(
:project
)
}
it
'avoids N+1 database queries'
do
control_count
=
ActiveRecord
::
QueryRecorder
.
new
{
subject
.
find_or_initialize_services
}.
count
expect
(
control_count
).
to
be
<=
4
end
it
'avoids N+1 database queries with more available services'
do
allow
(
Service
).
to
receive
(
:available_services_names
).
and_return
(
%w[pushover]
)
control_count
=
ActiveRecord
::
QueryRecorder
.
new
{
subject
.
find_or_initialize_services
}
allow
(
Service
).
to
receive
(
:available_services_names
).
and_call_original
expect
{
subject
.
find_or_initialize_services
}.
not_to
exceed_query_limit
(
control_count
)
end
context
'with disabled services'
do
before
do
allow
(
Service
).
to
receive
(
:available_services_names
).
and_return
(
%w[prometheus pushover teamcity]
)
allow
(
subject
).
to
receive
(
:disabled_services
).
and_return
(
%w[prometheus]
)
end
it
'returns only enabled services
'
do
it
'returns only enabled services sorted
'
do
services
=
subject
.
find_or_initialize_services
expect
(
services
.
count
).
to
eq
(
2
)
expect
(
services
.
size
).
to
eq
(
2
)
expect
(
services
.
map
(
&
:title
)).
to
eq
([
'JetBrains TeamCity CI'
,
'Pushover'
])
end
end
end
describe
'#disabled_services'
do
subject
{
build
(
:project
).
disabled_services
}
...
...
spec/services/projects/create_service_spec.rb
View file @
7266c032
...
...
@@ -724,9 +724,7 @@ RSpec.describe Projects::CreateService, '#execute' do
it
'cleans invalid record and logs warning'
,
:aggregate_failures
do
invalid_service_record
=
build
(
:prometheus_service
,
properties:
{
api_url:
nil
,
manual_configuration:
true
}.
to_json
)
allow_next_instance_of
(
Project
)
do
|
instance
|
allow
(
instance
).
to
receive
(
:build_prometheus_service
).
and_return
(
invalid_service_record
)
end
allow
(
PrometheusService
).
to
receive
(
:new
).
and_return
(
invalid_service_record
)
expect
(
Gitlab
::
ErrorTracking
).
to
receive
(
:track_exception
).
with
(
an_instance_of
(
ActiveRecord
::
RecordInvalid
),
include
(
extra:
{
project_id:
a_kind_of
(
Integer
)
}))
project
=
create_project
(
user
,
opts
)
...
...
spec/workers/projects/post_creation_worker_spec.rb
View file @
7266c032
...
...
@@ -64,10 +64,7 @@ RSpec.describe Projects::PostCreationWorker do
it
'cleans invalid record and logs warning'
,
:aggregate_failures
do
invalid_service_record
=
build
(
:prometheus_service
,
properties:
{
api_url:
nil
,
manual_configuration:
true
}.
to_json
)
allow_next_found_instance_of
(
Project
)
do
|
instance
|
allow
(
instance
).
to
receive
(
:build_prometheus_service
).
and_return
(
invalid_service_record
)
end
allow
(
PrometheusService
).
to
receive
(
:new
).
and_return
(
invalid_service_record
)
expect
(
Gitlab
::
ErrorTracking
).
to
receive
(
:track_exception
).
with
(
an_instance_of
(
ActiveRecord
::
RecordInvalid
),
include
(
extra:
{
project_id:
a_kind_of
(
Integer
)
})).
twice
subject
...
...
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