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
48436132
Commit
48436132
authored
Jun 29, 2021
by
Craig Miskell
Committed by
Bob Van Landuyt
Jun 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add clarifying docs about sidekiq queue migration
parent
948bd107
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
86 additions
and
6 deletions
+86
-6
db/migrate/20201224144948_migrate_coverage_report_worker.rb
db/migrate/20201224144948_migrate_coverage_report_worker.rb
+2
-2
db/migrate/20210526155257_rename_sync_security_report_approval_rules_sidekiq_queue.rb
...name_sync_security_report_approval_rules_sidekiq_queue.rb
+2
-2
doc/development/sidekiq_style_guide.md
doc/development/sidekiq_style_guide.md
+6
-2
rubocop/cop/migration/sidekiq_queue_migrate.rb
rubocop/cop/migration/sidekiq_queue_migrate.rb
+29
-0
spec/rubocop/cop/migration/sidekiq_queue_migrate_spec.rb
spec/rubocop/cop/migration/sidekiq_queue_migrate_spec.rb
+47
-0
No files found.
db/migrate/20201224144948_migrate_coverage_report_worker.rb
View file @
48436132
...
@@ -6,10 +6,10 @@ class MigrateCoverageReportWorker < ActiveRecord::Migration[6.0]
...
@@ -6,10 +6,10 @@ class MigrateCoverageReportWorker < ActiveRecord::Migration[6.0]
DOWNTIME
=
false
DOWNTIME
=
false
def
up
def
up
sidekiq_queue_migrate
'ci_pipelines_create_artifact'
,
to:
'ci_pipeline_artifacts_coverage_report'
sidekiq_queue_migrate
'ci_pipelines_create_artifact'
,
to:
'ci_pipeline_artifacts_coverage_report'
# rubocop:disable Migration/SidekiqQueueMigrate
end
end
def
down
def
down
sidekiq_queue_migrate
'ci_pipeline_artifacts_coverage_report'
,
to:
'ci_pipelines_create_artifact'
sidekiq_queue_migrate
'ci_pipeline_artifacts_coverage_report'
,
to:
'ci_pipelines_create_artifact'
# rubocop:disable Migration/SidekiqQueueMigrate
end
end
end
end
db/migrate/20210526155257_rename_sync_security_report_approval_rules_sidekiq_queue.rb
View file @
48436132
...
@@ -6,10 +6,10 @@ class RenameSyncSecurityReportApprovalRulesSidekiqQueue < ActiveRecord::Migratio
...
@@ -6,10 +6,10 @@ class RenameSyncSecurityReportApprovalRulesSidekiqQueue < ActiveRecord::Migratio
DOWNTIME
=
false
DOWNTIME
=
false
def
up
def
up
sidekiq_queue_migrate
'sync_security_reports_to_report_approval_rules'
,
to:
'ci_sync_reports_to_report_approval_rules'
sidekiq_queue_migrate
'sync_security_reports_to_report_approval_rules'
,
to:
'ci_sync_reports_to_report_approval_rules'
# rubocop:disable Migration/SidekiqQueueMigrate
end
end
def
down
def
down
sidekiq_queue_migrate
'ci_sync_reports_to_report_approval_rules'
,
to:
'sync_security_reports_to_report_approval_rules'
sidekiq_queue_migrate
'ci_sync_reports_to_report_approval_rules'
,
to:
'sync_security_reports_to_report_approval_rules'
# rubocop:disable Migration/SidekiqQueueMigrate
end
end
end
end
doc/development/sidekiq_style_guide.md
View file @
48436132
...
@@ -968,8 +968,8 @@ Sidekiq jobs, please consider removing the worker in a major release only.
...
@@ -968,8 +968,8 @@ Sidekiq jobs, please consider removing the worker in a major release only.
For the same reasons that removing workers is dangerous, care should be taken
For the same reasons that removing workers is dangerous, care should be taken
when renaming queues.
when renaming queues.
When renaming queues, use the
`sidekiq_queue_migrate`
helper migration method
,
When renaming queues, use the
`sidekiq_queue_migrate`
helper migration method
as shown in this example
:
in a
**post-deployment migration**
:
```
ruby
```
ruby
class
MigrateTheRenamedSidekiqQueue
<
ActiveRecord
::
Migration
[
5.0
]
class
MigrateTheRenamedSidekiqQueue
<
ActiveRecord
::
Migration
[
5.0
]
...
@@ -985,3 +985,7 @@ class MigrateTheRenamedSidekiqQueue < ActiveRecord::Migration[5.0]
...
@@ -985,3 +985,7 @@ class MigrateTheRenamedSidekiqQueue < ActiveRecord::Migration[5.0]
end
end
```
```
You must rename the queue in a post-deployment migration not in a normal
migration. Otherwise, it runs too early, before all the workers that
schedule these jobs have stopped running. See also
[
other examples
](
post_deployment_migrations.md#use-cases
)
.
rubocop/cop/migration/sidekiq_queue_migrate.rb
0 → 100644
View file @
48436132
# frozen_string_literal: true
require_relative
'../../migration_helpers'
module
RuboCop
module
Cop
module
Migration
# Cop that checks if sidekiq_queue_migrate is used in a regular
# (not post-deployment) migration.
class
SidekiqQueueMigrate
<
RuboCop
::
Cop
::
Cop
include
MigrationHelpers
MSG
=
'`sidekiq_queue_migrate` must only be used in post-deployment migrations'
def
on_def
(
node
)
return
unless
in_migration?
(
node
)
&&
!
in_post_deployment_migration?
(
node
)
node
.
each_descendant
(
:send
)
do
|
send_node
|
send_method
=
send_node
.
children
[
1
]
if
send_method
==
:sidekiq_queue_migrate
add_offense
(
send_node
,
location: :selector
)
end
end
end
end
end
end
end
spec/rubocop/cop/migration/sidekiq_queue_migrate_spec.rb
0 → 100644
View file @
48436132
# frozen_string_literal: true
require
'fast_spec_helper'
require_relative
'../../../../rubocop/cop/migration/sidekiq_queue_migrate'
RSpec
.
describe
RuboCop
::
Cop
::
Migration
::
SidekiqQueueMigrate
do
subject
(
:cop
)
{
described_class
.
new
}
def
source
(
meth
=
'change'
)
"def
#{
meth
}
; sidekiq_queue_migrate 'queue', to: 'new_queue'; end"
end
context
'when in a regular migration'
do
before
do
allow
(
cop
).
to
receive
(
:in_migration?
).
and_return
(
true
)
allow
(
cop
).
to
receive
(
:in_post_deployment_migration?
).
and_return
(
false
)
end
%w(up down change any_other_method)
.
each
do
|
method_name
|
it
"registers an offense when sidekiq_queue_migrate is used in #
#{
method_name
}
"
do
expect_offense
(
<<~
RUBY
)
def
#{
method_name
}
sidekiq_queue_migrate 'queue', to: 'new_queue'
^^^^^^^^^^^^^^^^^^^^^ `sidekiq_queue_migrate` must only be used in post-deployment migrations
end
RUBY
end
end
end
context
'when in a post-deployment migration'
do
before
do
allow
(
cop
).
to
receive
(
:in_migration?
).
and_return
(
true
)
allow
(
cop
).
to
receive
(
:in_post_deployment_migration?
).
and_return
(
true
)
end
it
'registers no offense'
do
expect_no_offenses
(
source
)
end
end
context
'when outside of a migration'
do
it
'registers no offense'
do
expect_no_offenses
(
source
)
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