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
c8ba46d3
Commit
c8ba46d3
authored
Sep 06, 2021
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'allowlist_tick_for' into 'master'
Allow tick_for callsite See merge request gitlab-org/gitlab!69623
parents
42679769
12c8709d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
app/services/ci/update_build_queue_service.rb
app/services/ci/update_build_queue_service.rb
+8
-6
spec/support/database/cross-join-allowlist.yml
spec/support/database/cross-join-allowlist.yml
+0
-1
No files found.
app/services/ci/update_build_queue_service.rb
View file @
c8ba46d3
...
...
@@ -99,15 +99,17 @@ module Ci
private
def
tick_for
(
build
,
runners
)
runners
=
runners
.
with_recent_runner_queue
runners
=
runners
.
with_tags
if
Feature
.
enabled?
(
:ci_preload_runner_tags
,
default_enabled: :yaml
)
::
Gitlab
::
Database
.
allow_cross_joins_across_databases
(
url:
'https://gitlab.com/gitlab-org/gitlab/-/issues/339937'
)
do
runners
=
runners
.
with_recent_runner_queue
runners
=
runners
.
with_tags
if
Feature
.
enabled?
(
:ci_preload_runner_tags
,
default_enabled: :yaml
)
metrics
.
observe_active_runners
(
->
{
runners
.
to_a
.
size
})
metrics
.
observe_active_runners
(
->
{
runners
.
to_a
.
size
})
runners
.
each
do
|
runner
|
metrics
.
increment_runner_tick
(
runner
)
runners
.
each
do
|
runner
|
metrics
.
increment_runner_tick
(
runner
)
runner
.
pick_build!
(
build
)
runner
.
pick_build!
(
build
)
end
end
end
...
...
spec/support/database/cross-join-allowlist.yml
View file @
c8ba46d3
...
...
@@ -329,7 +329,6 @@
-
"
./spec/services/ci/play_build_service_spec.rb"
-
"
./spec/services/ci/register_job_service_spec.rb"
-
"
./spec/services/ci/retry_pipeline_service_spec.rb"
-
"
./spec/services/ci/update_build_queue_service_spec.rb"
-
"
./spec/services/clusters/applications/prometheus_config_service_spec.rb"
-
"
./spec/services/deployments/older_deployments_drop_service_spec.rb"
-
"
./spec/services/environments/auto_stop_service_spec.rb"
...
...
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