Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #756 to v7.1 #789

Closed
wants to merge 89 commits into from
Closed

Backport #756 to v7.1 #789

wants to merge 89 commits into from

Conversation

andrepiske
Copy link

@andrepiske andrepiske commented Jun 7, 2023

Note: I opened this branch from the v7.1.29 tag, but I'm trying to merge it into the v7.1 branch, which seems outdated (last commit Oct 2021 vs Dec 2022 for the tag). My change is only 1 commit long. I guess the v7.1 branch has to be updated with the v7.1.29 tag, as I can't open a PR to a tag. Or perhaps I'm doing something wrong here :)

I'm having exactly the same problem as #779 and this PR solves it by backporting PR #756, which applies to v8 of this gem, to v7.

I couldn't find any other instances of the string :workers that should be changed and I also tested this on my dev machine with a real app and it fixes the problem.

Let me know if this looks good enough!

mhenrixon and others added 30 commits October 8, 2021 12:20
I was going through the docs after having some trouble with this and
noticed that DailyDrip is no longer a thing :(

Using the direct link to Sidekiq's wiki instead.
* Fix edge case in ruby reaper

Closes #653

The problem was that the reaper returns nil instead of the memo. Many thanks to @francesmcmullin for the wonderfully detailed report and investigation. Now we have a regression test for this behavior.

* Mandatory rubocop commit
* Improve reaper performance under heavy load

Closes #663

Signed-off-by: mhenrixon <mikael@mhenrixon.com>

* Mandatory linter commit
The `mhenrixon.github.io` urls result into `404`

Co-authored-by: Mikael Henriksson <mikael@mhenrixon.com>
* Bump bundler and friends

* Fix ruby 3 specific test error?

* Get rid of warnings against sidekiq/master

* Skip failing test against ruby 3
* Prepare for redis 5.0.0

* Run on ruby 3.1

* Mandatory linter commit

* Mandatory linter commit
* Fix the remaining deprecation warnings

* Mandatory linter commit

* Allow pipeline to be passed on
* `on_conflict { server: :reschedule }` always uses default queue.

I noticed, that when I use the `on_conflict` strategy `:reschedule` with a job, that has a
`until_and_while_executing` lock and is configured to run on a specific
queue,(e.g. `no_default`). `:reschedule` tries to enqueue it into the
`default` queue.
The commit lets `:reschedule` honour the queue.

* Modify specs to honour queue.

* Listen to Rubocop, wise he is.
* Fix drift

* Smells like a fish

* Mandatory rubocop commit

* Fix broken tests against master

* Mandatory linter commit

* Fix concurrent ruby warnings
francesmcmullin and others added 19 commits July 1, 2022 09:53
Avoid negative ranges when looping through queues
Co-authored-by: Mikael Henriksson <mikael@mhenrixon.com>
* Fix Sidekiq::Worker.clear_all override not being applied

Since the method is defined as a singleton the testing override needs to
be prepended to the singleton class.

* Rename `testing_spec` to `worker_spec`

`
* Chore(deps): Bump bundler on Actions

* Chore(deps): Adds toxiproxy

* Chore(test): Attempt to break push

* Chore(test): Account for CI

* fix(toxiproxy): replicate the problem

* Chore(docker): open ports to toxiproxy?

* Fix(timouts): Always wait a minimal amount

* Chore(toxiproxy): Shopify isn't putting much effort into ubuntu

* Chore(smell): Clean up

* Chore(lint): Mandatory linter commit

* Chore(CI): Run RSpec RUUUUNN!

* Chore(CI): Skip on CI because... toxiproxy...

* Fix(locksmith): Allow immediate nonblock pop
* Fix(unlock): Delete primed keys on last entry

* Chore(test): Add test coverage
…#732)

* Chore(deps): Add redis-namespace for debugging

* Fix(namespace): Ensure compatible with namespaces

* Chore(lint): Address code smells
* fix: consistent digests

* chore(lint): lint'em real good

* fix(redis): silence deprecations

* fix(spec): another wrong digest

* chore(deps): ignore sidekiq develop for now

* chore(deps): stupid compatibility

* fix(redis): use the ruby driver

* chore(deps): lock redis to < 5.0
BACKGROUND -------------------------------------------------------------

#707 introduced a regression where the instance level `after_unlock`
callback is no longer being called. This was due to the change of using
`item[CLASS]` instead of `worker_class` to set `job_class` in
`SidekiqUniqueJobs::Middelware#call`. `item[CLASS]` is a string, where
as `worker_class` can be either an instance, or the class itself. For the
instance level `after_unlock` to work, we need `job_class` to be an
instance of the worker.

This fixes the issue by switching back to setting `job_class` to
`worker_class`

CHANGELOG --------------------------------------------------------------

- Use worker_class for self.job_class in Middleware#call

Co-authored-by: Mikael Henriksson <mikael@mhenrixon.com>
@andrepiske andrepiske changed the title Backports #756 to v7.1 Backport #756 to v7.1 Jun 7, 2023
@sodabrew
Copy link

sodabrew commented Jun 23, 2023

edit: scratch my prior message, now I see what you're describing: the v7.1.x releases were tagged from somewhere else and are not reflected on the v7.1 branch. So maybe there's a two-step change required here: first @mhenrixon if you could merge the 7.1.29 tag to the v7.1 branch, then @andrepiske a PR that cherry-picks #756 onto the updated v7.1 branch. @mhenrixon then you could tag release version v7.1.30 on the v7.1 branch and all is good.

Super appreciate finding this gem that looks like it will solve exactly the locking/rescheduling need I'm running in to!

@mhenrixon
Copy link
Owner

This should be released as v7.1.30 https://github.com/mhenrixon/sidekiq-unique-jobs/releases/tag/v7.1.30

@mhenrixon mhenrixon closed this Jul 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet