Fix configuration for sidekiq-unique-jobs after 7.x upgrade (#15908)

Remove locks from scheduled jobs
4 years ago · e89e976e92
parent 33198d8c05
commit e89e976e92
12 changed files with 30 additions and 14 deletions
--- a/app/workers/scheduler/backup_cleanup_scheduler.rb
+++ b/app/workers/scheduler/backup_cleanup_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::BackupCleanupScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    old_backups.reorder(nil).find_each(&:destroy!)
--- a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
+++ b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::DoorkeeperCleanupScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    Doorkeeper::AccessToken.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
--- a/app/workers/scheduler/email_scheduler.rb
+++ b/app/workers/scheduler/email_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::EmailScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  FREQUENCY      = 7.days.freeze
  SIGN_IN_OFFSET = 1.day.freeze
--- a/app/workers/scheduler/feed_cleanup_scheduler.rb
+++ b/app/workers/scheduler/feed_cleanup_scheduler.rb
@ -4,7 +4,7 @@ class Scheduler::FeedCleanupScheduler
  include Sidekiq::Worker
  include Redisable

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    clean_home_feeds!
--- a/app/workers/scheduler/instance_refresh_scheduler.rb
+++ b/app/workers/scheduler/instance_refresh_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::InstanceRefreshScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    Instance.refresh
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@ -5,7 +5,7 @@ class Scheduler::IpCleanupScheduler

  IP_RETENTION_PERIOD = 1.year.freeze

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    clean_ip_columns!
--- a/app/workers/scheduler/media_cleanup_scheduler.rb
+++ b/app/workers/scheduler/media_cleanup_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::MediaCleanupScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    unattached_media.find_each(&:destroy)
--- a/app/workers/scheduler/pghero_scheduler.rb
+++ b/app/workers/scheduler/pghero_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::PgheroScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    PgHero.capture_space_stats
--- a/app/workers/scheduler/scheduled_statuses_scheduler.rb
+++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::ScheduledStatusesScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    publish_scheduled_statuses!
--- a/app/workers/scheduler/trending_tags_scheduler.rb
+++ b/app/workers/scheduler/trending_tags_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::TrendingTagsScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    TrendingTags.update! if Setting.trends
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@ -3,7 +3,7 @@
 class Scheduler::UserCleanupScheduler
  include Sidekiq::Worker

-  sidekiq_options lock: :until_executed, retry: 0
+  sidekiq_options retry: 0

  def perform
    clean_unconfirmed_accounts!
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@ -14,14 +14,30 @@ Sidekiq.configure_server do |config|
    chain.add SidekiqErrorHandler
  end

-  config.death_handlers << lambda do |job, _ex|
-    digest = job['lock_digest']
-    SidekiqUniqueJobs::Digests.delete_by_digest(digest) if digest
+  config.server_middleware do |chain|
+    chain.add SidekiqUniqueJobs::Middleware::Server
+  end
+
+  config.client_middleware do |chain|
+    chain.add SidekiqUniqueJobs::Middleware::Client
  end
+
+  SidekiqUniqueJobs::Server.configure(config)
 end

 Sidekiq.configure_client do |config|
  config.redis = redis_params
+
+  config.client_middleware do |chain|
+    chain.add SidekiqUniqueJobs::Middleware::Client
+  end
 end

 Sidekiq.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
+
+SidekiqUniqueJobs.configure do |config|
+  config.reaper          = :ruby
+  config.reaper_count    = 1000
+  config.reaper_interval = 600
+  config.reaper_timeout  = 150
+end