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
2c5a449f
Commit
2c5a449f
authored
Mar 16, 2020
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ChatNotificationWorker has external dependencies
parent
5a0c073c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
app/workers/all_queues.yml
app/workers/all_queues.yml
+2
-2
app/workers/chat_notification_worker.rb
app/workers/chat_notification_worker.rb
+2
-6
spec/lib/gitlab/sidekiq_cluster/cli_spec.rb
spec/lib/gitlab/sidekiq_cluster/cli_spec.rb
+1
-1
No files found.
app/workers/all_queues.yml
View file @
2c5a449f
...
...
@@ -866,8 +866,8 @@
:idempotent:
-
:name: chat_notification
:feature_category: :chatops
:has_external_dependencies:
:urgency: :
high
:has_external_dependencies:
true
:urgency: :
low
:resource_boundary: :unknown
:weight:
2
:idempotent:
...
...
app/workers/chat_notification_worker.rb
View file @
2c5a449f
...
...
@@ -7,13 +7,9 @@ class ChatNotificationWorker # rubocop:disable Scalability/IdempotentWorker
sidekiq_options
retry:
false
feature_category
:chatops
urgency
:
high
urgency
:
low
# Can't be high as it has external dependencies
weight
2
# TODO: break this into multiple jobs
# as the `responder` uses external dependencies
# See https://gitlab.com/gitlab-com/gl-infra/scalability/issues/34
# worker_has_external_dependencies!
worker_has_external_dependencies!
RESCHEDULE_INTERVAL
=
2
.
seconds
RESCHEDULE_TIMEOUT
=
5
.
minutes
...
...
spec/lib/gitlab/sidekiq_cluster/cli_spec.rb
View file @
2c5a449f
...
...
@@ -157,7 +157,7 @@ describe Gitlab::SidekiqCluster::CLI do
.
with
([[
'chat_notification'
],
[
'project_export'
]],
default_options
)
.
and_return
([])
cli
.
run
(
%w(--experimental-queue-selector feature_category=chatops&
urgency=high
resource_boundary=memory&feature_category=importers)
)
cli
.
run
(
%w(--experimental-queue-selector feature_category=chatops&
has_external_dependencies=true
resource_boundary=memory&feature_category=importers)
)
end
it
'allows the special * selector'
do
...
...
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