Because replace is a client strategy, it should only remove client locks aka queue locks.
#778
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…locks aka queue locks.
mhenrixon
reviewed
May 23, 2023
lib/sidekiq_unique_jobs/digests.rb
Outdated
| result, elapsed = timed do | ||
| queue = queuetime ? digest : "" | ||
| queue_queued = queuetime ? "#{digest}:QUEUED" : "" |
There was a problem hiding this comment.
I'm still thinking about this, I get the problem, but wondering if there is a better way.
The code ended up being a little repetitive below. Perhaps we could just have two other methods:
- queuetime_keys
- runtime_keys
keys = []
keys.concat(queuetime_keys)
keys.concat(runtime_keys)
call_script(:delete_by_digest, keys)
EMPTY_KEYS_SEGMENT = ["", "", "", ""].freeze
def queuetime_keys(queuetime)
return EMPTY_KEYS_SEGMENT unless queuetime
[
digest,
"#{digest}:QUEUED",
"#{digest}:PRIMED",
"#{digest}:LOCKED",
]
endWhat do you think? I find the code a little harsh on the eyes. Do you know any better way (than mine) to construct the array to send to the script (the keys) I'm all ears and eyes.
There was a problem hiding this comment.
I refactored the code a little and created the two helper methods. WDYT?
Cleaning up `Digests#delete_by_digest`. Instead of assembling all keys inside of the method, we introduced a const and two helper methods to make the code easier on the eyes.
bigzed
force-pushed
the
fix-replace-for-until-and-while-executing
branch
from
232f6ea
to
96939ce
Compare
mhenrixon
approved these changes
Aug 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I just tried to use
replacewithuntil_and_while_executingand noticed, that when I spamTheLockedJob.perform_async(1)it would replace the job in the queue and also delete the runtime lock of the already running job leading to two jobs running at the same time.The change results in the job correctly being replaced on the queue without removing existing runtime locks for the job.