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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
10f135cf
Commit
10f135cf
authored
Mar 07, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace
parent
2a97550d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
81 additions
and
2 deletions
+81
-2
app/workers/all_queues.yml
app/workers/all_queues.yml
+1
-1
db/post_migrate/20180307012445_migrate_update_head_pipeline_for_merge_request_sidekiq_queue.rb
...e_update_head_pipeline_for_merge_request_sidekiq_queue.rb
+15
-0
db/schema.rb
db/schema.rb
+1
-1
spec/migrations/migrate_update_head_pipeline_for_merge_request_sidekiq_queue_spec.rb
...ate_head_pipeline_for_merge_request_sidekiq_queue_spec.rb
+64
-0
No files found.
app/workers/all_queues.yml
View file @
10f135cf
...
@@ -48,7 +48,6 @@
...
@@ -48,7 +48,6 @@
-
pipeline_default:build_trace_sections
-
pipeline_default:build_trace_sections
-
pipeline_default:pipeline_metrics
-
pipeline_default:pipeline_metrics
-
pipeline_default:pipeline_notification
-
pipeline_default:pipeline_notification
-
pipeline_default:update_head_pipeline_for_merge_request
-
pipeline_hooks:build_hooks
-
pipeline_hooks:build_hooks
-
pipeline_hooks:pipeline_hooks
-
pipeline_hooks:pipeline_hooks
-
pipeline_processing:build_finished
-
pipeline_processing:build_finished
...
@@ -58,6 +57,7 @@
...
@@ -58,6 +57,7 @@
-
pipeline_processing:pipeline_success
-
pipeline_processing:pipeline_success
-
pipeline_processing:pipeline_update
-
pipeline_processing:pipeline_update
-
pipeline_processing:stage_update
-
pipeline_processing:stage_update
-
pipeline_processing:update_head_pipeline_for_merge_request
-
repository_check:repository_check_clear
-
repository_check:repository_check_clear
-
repository_check:repository_check_single_repository
-
repository_check:repository_check_single_repository
...
...
db/post_migrate/20180307012445_migrate_update_head_pipeline_for_merge_request_sidekiq_queue.rb
0 → 100644
View file @
10f135cf
class
MigrateUpdateHeadPipelineForMergeRequestSidekiqQueue
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
def
up
sidekiq_queue_migrate
'pipeline_default:update_head_pipeline_for_merge_request'
,
to:
'pipeline_processing:update_head_pipeline_for_merge_request'
end
def
down
sidekiq_queue_migrate
'pipeline_processing:update_head_pipeline_for_merge_request'
,
to:
'pipeline_default:update_head_pipeline_for_merge_request'
end
end
db/schema.rb
View file @
10f135cf
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended that you check this file into your version control system.
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2018030
60740
45
)
do
ActiveRecord
::
Schema
.
define
(
version:
2018030
70124
45
)
do
# These are extensions that must be enabled in order to support this database
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
enable_extension
"plpgsql"
...
...
spec/migrations/migrate_update_head_pipeline_for_merge_request_sidekiq_queue_spec.rb
0 → 100644
View file @
10f135cf
require
'spec_helper'
require
Rails
.
root
.
join
(
'db'
,
'post_migrate'
,
'20180307012445_migrate_update_head_pipeline_for_merge_request_sidekiq_queue.rb'
)
describe
MigrateUpdateHeadPipelineForMergeRequestSidekiqQueue
,
:sidekiq
,
:redis
do
include
Gitlab
::
Database
::
MigrationHelpers
context
'when there are jobs in the queues'
do
it
'correctly migrates queue when migrating up'
do
Sidekiq
::
Testing
.
disable!
do
stubbed_worker
(
queue:
'pipeline_default:update_head_pipeline_for_merge_request'
).
perform_async
(
'Something'
,
[
1
])
stubbed_worker
(
queue:
'pipeline_processing:update_head_pipeline_for_merge_request'
).
perform_async
(
'Something'
,
[
1
])
described_class
.
new
.
up
expect
(
sidekiq_queue_length
(
'pipeline_default:update_head_pipeline_for_merge_request'
)).
to
eq
0
expect
(
sidekiq_queue_length
(
'pipeline_processing:update_head_pipeline_for_merge_request'
)).
to
eq
2
end
end
it
'does not affect other queues under the same namespace'
do
Sidekiq
::
Testing
.
disable!
do
stubbed_worker
(
queue:
'pipeline_default:build_coverage'
).
perform_async
(
'Something'
,
[
1
])
stubbed_worker
(
queue:
'pipeline_default:build_trace_sections'
).
perform_async
(
'Something'
,
[
1
])
stubbed_worker
(
queue:
'pipeline_default:pipeline_metrics'
).
perform_async
(
'Something'
,
[
1
])
stubbed_worker
(
queue:
'pipeline_default:pipeline_notification'
).
perform_async
(
'Something'
,
[
1
])
described_class
.
new
.
up
expect
(
sidekiq_queue_length
(
'pipeline_default:build_coverage'
)).
to
eq
1
expect
(
sidekiq_queue_length
(
'pipeline_default:build_trace_sections'
)).
to
eq
1
expect
(
sidekiq_queue_length
(
'pipeline_default:pipeline_metrics'
)).
to
eq
1
expect
(
sidekiq_queue_length
(
'pipeline_default:pipeline_notification'
)).
to
eq
1
end
end
it
'correctly migrates queue when migrating down'
do
Sidekiq
::
Testing
.
disable!
do
stubbed_worker
(
queue:
'pipeline_processing:update_head_pipeline_for_merge_request'
).
perform_async
(
'Something'
,
[
1
])
described_class
.
new
.
down
expect
(
sidekiq_queue_length
(
'pipeline_default:update_head_pipeline_for_merge_request'
)).
to
eq
1
expect
(
sidekiq_queue_length
(
'pipeline_processing:update_head_pipeline_for_merge_request'
)).
to
eq
0
end
end
end
context
'when there are no jobs in the queues'
do
it
'does not raise error when migrating up'
do
expect
{
described_class
.
new
.
up
}.
not_to
raise_error
end
it
'does not raise error when migrating down'
do
expect
{
described_class
.
new
.
down
}.
not_to
raise_error
end
end
def
stubbed_worker
(
queue
:)
Class
.
new
do
include
Sidekiq
::
Worker
sidekiq_options
queue:
queue
end
end
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