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
9550cc7e
Commit
9550cc7e
authored
Aug 31, 2021
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab master
parents
1c2c9fd9
a24f1c03
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
81 additions
and
49 deletions
+81
-49
.cross-join-allowlist.yml
.cross-join-allowlist.yml
+0
-1
app/finders/ci/pipelines_for_merge_request_finder.rb
app/finders/ci/pipelines_for_merge_request_finder.rb
+13
-11
app/models/ci/runner.rb
app/models/ci/runner.rb
+8
-4
app/services/ci/register_job_service.rb
app/services/ci/register_job_service.rb
+28
-26
lib/gitlab/database.rb
lib/gitlab/database.rb
+1
-0
spec/support/database/prevent_cross_joins.rb
spec/support/database/prevent_cross_joins.rb
+11
-5
spec/support_specs/database/prevent_cross_joins_spec.rb
spec/support_specs/database/prevent_cross_joins_spec.rb
+20
-2
No files found.
.cross-join-allowlist.yml
View file @
9550cc7e
...
...
@@ -97,7 +97,6 @@
-
"
./ee/spec/services/ci/minutes/refresh_cached_data_service_spec.rb"
-
"
./ee/spec/services/ci/pipeline_creation/drop_not_runnable_builds_service_spec.rb"
-
"
./ee/spec/services/ci/process_pipeline_service_spec.rb"
-
"
./ee/spec/services/ci/register_job_service_spec.rb"
-
"
./ee/spec/services/ci/retry_build_service_spec.rb"
-
"
./ee/spec/services/ci/retry_pipeline_service_spec.rb"
-
"
./ee/spec/services/ci/trigger_downstream_subscription_service_spec.rb"
...
...
app/finders/ci/pipelines_for_merge_request_finder.rb
View file @
9550cc7e
...
...
@@ -29,17 +29,19 @@ module Ci
# Fetch all pipelines without permission check.
def
all
strong_memoize
(
:all_pipelines
)
do
next
Ci
::
Pipeline
.
none
unless
source_project
pipelines
=
if
merge_request
.
persisted?
pipelines_using_cte
else
triggered_for_branch
.
for_sha
(
commit_shas
)
end
sort
(
pipelines
)
::
Gitlab
::
Database
.
allow_cross_joins_across_databases
(
url:
'https://gitlab.com/gitlab-org/gitlab/-/issues/336891'
)
do
strong_memoize
(
:all_pipelines
)
do
next
Ci
::
Pipeline
.
none
unless
source_project
pipelines
=
if
merge_request
.
persisted?
pipelines_using_cte
else
triggered_for_branch
.
for_sha
(
commit_shas
)
end
sort
(
pipelines
)
end
end
end
...
...
app/models/ci/runner.rb
View file @
9550cc7e
...
...
@@ -420,14 +420,18 @@ module Ci
end
def
no_projects
if
projects
.
any?
errors
.
add
(
:runner
,
'cannot have projects assigned'
)
::
Gitlab
::
Database
.
allow_cross_joins_across_databases
(
url:
'https://gitlab.com/gitlab-org/gitlab/-/issues/338659'
)
do
if
projects
.
any?
errors
.
add
(
:runner
,
'cannot have projects assigned'
)
end
end
end
def
no_groups
if
groups
.
any?
errors
.
add
(
:runner
,
'cannot have groups assigned'
)
::
Gitlab
::
Database
.
allow_cross_joins_across_databases
(
url:
'https://gitlab.com/gitlab-org/gitlab/-/issues/338659'
)
do
if
groups
.
any?
errors
.
add
(
:runner
,
'cannot have groups assigned'
)
end
end
end
...
...
app/services/ci/register_job_service.rb
View file @
9550cc7e
...
...
@@ -103,40 +103,42 @@ module Ci
# rubocop: disable CodeReuse/ActiveRecord
def
each_build
(
params
,
&
blk
)
queue
=
::
Ci
::
Queue
::
BuildQueueService
.
new
(
runner
)
builds
=
begin
if
runner
.
instance_type?
queue
.
builds_for_shared_runner
elsif
runner
.
group_type?
queue
.
builds_for_group_runner
else
queue
.
builds_for_project_runner
::
Gitlab
::
Database
.
allow_cross_joins_across_databases
(
url:
'https://gitlab.com/gitlab-org/gitlab/-/issues/339429'
)
do
queue
=
::
Ci
::
Queue
::
BuildQueueService
.
new
(
runner
)
builds
=
begin
if
runner
.
instance_type?
queue
.
builds_for_shared_runner
elsif
runner
.
group_type?
queue
.
builds_for_group_runner
else
queue
.
builds_for_project_runner
end
end
end
if
runner
.
ref_protected?
builds
=
queue
.
builds_for_protected_runner
(
builds
)
end
if
runner
.
ref_protected?
builds
=
queue
.
builds_for_protected_runner
(
builds
)
end
# pick builds that does not have other tags than runner's one
builds
=
queue
.
builds_matching_tag_ids
(
builds
,
runner
.
tags
.
ids
)
# pick builds that does not have other tags than runner's one
builds
=
queue
.
builds_matching_tag_ids
(
builds
,
runner
.
tags
.
ids
)
# pick builds that have at least one tag
unless
runner
.
run_untagged?
builds
=
queue
.
builds_with_any_tags
(
builds
)
end
# pick builds that have at least one tag
unless
runner
.
run_untagged?
builds
=
queue
.
builds_with_any_tags
(
builds
)
end
# pick builds that older than specified age
if
params
.
key?
(
:job_age
)
builds
=
queue
.
builds_queued_before
(
builds
,
params
[
:job_age
].
seconds
.
ago
)
end
# pick builds that older than specified age
if
params
.
key?
(
:job_age
)
builds
=
queue
.
builds_queued_before
(
builds
,
params
[
:job_age
].
seconds
.
ago
)
end
build_ids
=
retrieve_queue
(
->
{
queue
.
execute
(
builds
)
})
build_ids
=
retrieve_queue
(
->
{
queue
.
execute
(
builds
)
})
@metrics
.
observe_queue_size
(
->
{
build_ids
.
size
},
@runner
.
runner_type
)
@metrics
.
observe_queue_size
(
->
{
build_ids
.
size
},
@runner
.
runner_type
)
build_ids
.
each
{
|
build_id
|
yield
Ci
::
Build
.
find
(
build_id
)
}
build_ids
.
each
{
|
build_id
|
yield
Ci
::
Build
.
find
(
build_id
)
}
end
end
# rubocop: enable CodeReuse/ActiveRecord
...
...
lib/gitlab/database.rb
View file @
9550cc7e
...
...
@@ -145,6 +145,7 @@ module Gitlab
def
self
.
allow_cross_joins_across_databases
(
url
:)
# this method is implemented in:
# spec/support/database/prevent_cross_joins.rb
yield
end
# This method will allow cross database modifications within the block
...
...
spec/support/database/prevent_cross_joins.rb
View file @
9550cc7e
...
...
@@ -11,7 +11,7 @@
#
# class User
# def ci_owned_runners
# ::Gitlab::Database.allow_cross_joins_across_databases
!
(url: link-to-issue-url)
# ::Gitlab::Database.allow_cross_joins_across_databases(url: link-to-issue-url)
#
# ...
# end
...
...
@@ -21,8 +21,10 @@ module Database
module
PreventCrossJoins
CrossJoinAcrossUnsupportedTablesError
=
Class
.
new
(
StandardError
)
ALLOW_THREAD_KEY
=
:allow_cross_joins_across_databases
def
self
.
validate_cross_joins!
(
sql
)
return
if
Thread
.
current
[
:allow_cross_joins_across_databases
]
return
if
Thread
.
current
[
ALLOW_THREAD_KEY
]
# Allow spec/support/database_cleaner.rb queries to disable/enable triggers for many tables
# See https://gitlab.com/gitlab-org/gitlab/-/issues/339396
...
...
@@ -55,7 +57,7 @@ module Database
::
Database
::
PreventCrossJoins
.
validate_cross_joins!
(
event
.
payload
[
:sql
])
end
Thread
.
current
[
:allow_cross_joins_across_databases
]
=
false
Thread
.
current
[
ALLOW_THREAD_KEY
]
=
false
yield
ensure
...
...
@@ -65,8 +67,12 @@ module Database
module
GitlabDatabaseMixin
def
allow_cross_joins_across_databases
(
url
:)
Thread
.
current
[
:allow_cross_joins_across_databases
]
=
true
super
old_value
=
Thread
.
current
[
ALLOW_THREAD_KEY
]
Thread
.
current
[
ALLOW_THREAD_KEY
]
=
true
yield
ensure
Thread
.
current
[
ALLOW_THREAD_KEY
]
=
old_value
end
end
end
...
...
spec/support_specs/database/prevent_cross_joins_spec.rb
View file @
9550cc7e
...
...
@@ -24,9 +24,13 @@ RSpec.describe Database::PreventCrossJoins do
context
'when allow_cross_joins_across_databases is used'
do
it
'does not raise exception'
do
Gitlab
::
Database
.
allow_cross_joins_across_databases
(
url:
'http://issue-url'
)
expect
{
main_and_ci_query_allowlisted
}.
not_to
raise_error
end
end
expect
{
main_and_ci_query
}.
not_to
raise_error
context
'when allow_cross_joins_across_databases is used'
do
it
'does not raise exception'
do
expect
{
main_and_ci_query_allowlist_nested
}.
not_to
raise_error
end
end
end
...
...
@@ -34,6 +38,20 @@ RSpec.describe Database::PreventCrossJoins do
private
def
main_and_ci_query_allowlisted
Gitlab
::
Database
.
allow_cross_joins_across_databases
(
url:
'http://issue-url'
)
do
main_and_ci_query
end
end
def
main_and_ci_query_allowlist_nested
Gitlab
::
Database
.
allow_cross_joins_across_databases
(
url:
'http://issue-url'
)
do
main_and_ci_query_allowlisted
main_and_ci_query
end
end
def
main_only_query
Issue
.
joins
(
:project
).
last
end
...
...
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