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
3e1a3de5
Commit
3e1a3de5
authored
May 06, 2021
by
Nikola Milojevic
Committed by
Kamil Trzciński
May 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delayed job should retry only once
parent
0ee2d125
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
11 deletions
+38
-11
ee/lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb
...tlab/database/load_balancing/sidekiq_server_middleware.rb
+7
-1
ee/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb
...database/load_balancing/sidekiq_server_middleware_spec.rb
+31
-10
No files found.
ee/lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb
View file @
3e1a3de5
...
@@ -35,7 +35,7 @@ module Gitlab
...
@@ -35,7 +35,7 @@ module Gitlab
if
replica_caught_up?
(
location
)
if
replica_caught_up?
(
location
)
job
[
:database_chosen
]
=
'replica'
job
[
:database_chosen
]
=
'replica'
false
false
elsif
worker_class
.
get_data_consistency
==
:delayed
&&
job
[
'retry_count'
].
to_i
==
0
elsif
worker_class
.
get_data_consistency
==
:delayed
&&
not_yet_retried?
(
job
)
job
[
:database_chosen
]
=
'retry'
job
[
:database_chosen
]
=
'retry'
raise
JobReplicaNotUpToDate
,
"Sidekiq job
#{
worker_class
}
JID-
#{
job
[
'jid'
]
}
couldn't use the replica."
\
raise
JobReplicaNotUpToDate
,
"Sidekiq job
#{
worker_class
}
JID-
#{
job
[
'jid'
]
}
couldn't use the replica."
\
" Replica was not up to date."
" Replica was not up to date."
...
@@ -45,6 +45,12 @@ module Gitlab
...
@@ -45,6 +45,12 @@ module Gitlab
end
end
end
end
def
not_yet_retried?
(
job
)
# if `retry_count` is `nil` it indicates that this job was never retried
# the `0` indicates that this is a first retry
job
[
'retry_count'
].
nil?
end
def
load_balancer
def
load_balancer
LoadBalancing
.
proxy
.
load_balancer
LoadBalancing
.
proxy
.
load_balancer
end
end
...
...
ee/spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb
View file @
3e1a3de5
...
@@ -100,7 +100,7 @@ RSpec.describe Gitlab::Database::LoadBalancing::SidekiqServerMiddleware do
...
@@ -100,7 +100,7 @@ RSpec.describe Gitlab::Database::LoadBalancing::SidekiqServerMiddleware do
let
(
:queue
)
{
'default'
}
let
(
:queue
)
{
'default'
}
let
(
:redis_pool
)
{
Sidekiq
.
redis_pool
}
let
(
:redis_pool
)
{
Sidekiq
.
redis_pool
}
let
(
:worker
)
{
worker_class
.
new
}
let
(
:worker
)
{
worker_class
.
new
}
let
(
:job
)
{
{
"job_id"
=>
"a180b47c-3fd6-41b8-81e9-34da61c3400e"
,
'database_replica_location'
=>
'0/D525E3A8'
}
}
let
(
:job
)
{
{
"
retry"
=>
3
,
"
job_id"
=>
"a180b47c-3fd6-41b8-81e9-34da61c3400e"
,
'database_replica_location'
=>
'0/D525E3A8'
}
}
let
(
:block
)
{
10
}
let
(
:block
)
{
10
}
before
do
before
do
...
@@ -127,22 +127,37 @@ RSpec.describe Gitlab::Database::LoadBalancing::SidekiqServerMiddleware do
...
@@ -127,22 +127,37 @@ RSpec.describe Gitlab::Database::LoadBalancing::SidekiqServerMiddleware do
context
'when replica is not up to date'
do
context
'when replica is not up to date'
do
before
do
before
do
allow
(
middleware
).
to
receive
(
:replica_caught_up?
).
and_return
(
false
)
allow
(
::
Gitlab
::
Database
::
LoadBalancing
).
to
receive_message_chain
(
:proxy
,
:load_balancer
,
:release_host
)
allow
(
::
Gitlab
::
Database
::
LoadBalancing
).
to
receive_message_chain
(
:proxy
,
:load_balancer
,
:host
,
:caught_up?
).
and_return
(
false
)
end
end
context
'when job is retried once'
do
around
do
|
example
|
it
'raise an error and retries'
do
with_sidekiq_server_middleware
do
|
chain
|
expect
{
middleware
.
call
(
worker
,
job
,
double
(
:queue
))
{
block
}
}.
to
raise_error
(
Gitlab
::
Database
::
LoadBalancing
::
SidekiqServerMiddleware
::
JobReplicaNotUpToDate
)
chain
.
add
described_class
Sidekiq
::
Testing
.
disable!
{
example
.
run
}
end
end
end
end
context
'when job is retried more then once'
do
context
'when job is executed first'
do
before
do
it
'raise an error and retries'
,
:aggregate_failures
do
job
[
'retry_count'
]
=
1
expect
do
process_job
(
job
)
end
.
to
raise_error
(
Sidekiq
::
JobRetry
::
Skip
)
expect
(
job
[
'error_class'
]).
to
eq
(
'Gitlab::Database::LoadBalancing::SidekiqServerMiddleware::JobReplicaNotUpToDate'
)
expect
(
job
[
:database_chosen
]).
to
eq
(
'retry'
)
end
end
end
include_examples
'stick to the primary'
context
'when job is retried'
do
include_examples
'job marked with chosen database'
it
'stick to the primary'
,
:aggregate_failures
do
expect
do
process_job
(
job
)
end
.
to
raise_error
(
Sidekiq
::
JobRetry
::
Skip
)
process_job
(
job
)
expect
(
job
[
:database_chosen
]).
to
eq
(
'primary'
)
end
end
end
end
end
end
end
...
@@ -160,4 +175,10 @@ RSpec.describe Gitlab::Database::LoadBalancing::SidekiqServerMiddleware do
...
@@ -160,4 +175,10 @@ RSpec.describe Gitlab::Database::LoadBalancing::SidekiqServerMiddleware do
end
end
end
end
end
end
def
process_job
(
job
)
Sidekiq
::
JobRetry
.
new
.
local
(
worker_class
,
job
,
queue
)
do
worker_class
.
process_job
(
job
)
end
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