Make all sidekiq jobs unique

Every one of these jobs has results based purely on the arguments, so there's no need — and some danger — to having duplicate jobs.
WikiEducationFoundation · Oct 11, 2017 · cc59f2f · cc59f2f
1 parent a791349
commit cc59f2f
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,7 @@ gem 'figaro'
 gem 'whenever'
 gem 'mysql2'
 gem 'sidekiq'
+gem 'sidekiq-unique-jobs'
 gem 'activerecord-import'
 gem 'dalli'
 gem 'connection_pool'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -434,6 +434,9 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.3, >= 3.3.3)
+    sidekiq-unique-jobs (5.0.10)
+      sidekiq (>= 4.0, <= 6.0)
+      thor (~> 0)
     simple_form (3.5.0)
       actionpack (> 4, < 5.2)
       activemodel (> 4, < 5.2)
@@ -561,6 +564,7 @@ DEPENDENCIES
   sentry-raven
   shoulda-matchers (~> 3.1)
   sidekiq
+  sidekiq-unique-jobs
   simple_form
   simplecov
   timecop

diff --git a/app/workers/alert_mailer_worker.rb b/app/workers/alert_mailer_worker.rb
@@ -2,6 +2,7 @@
 
 class AlertMailerWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_email(alert_id:)
     perform_async(alert_id)

diff --git a/app/workers/announce_course_worker.rb b/app/workers/announce_course_worker.rb
@@ -4,6 +4,7 @@
 
 class AnnounceCourseWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_announcement(course:, editing_user:, instructor:)
     perform_async(course.id, editing_user.id, instructor.id)

diff --git a/app/workers/blocked_edits_worker.rb b/app/workers/blocked_edits_worker.rb
@@ -4,6 +4,7 @@
 
 class BlockedEditsWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_notifications(user:)
     perform_async(user.id)

diff --git a/app/workers/course_submission_mailer_worker.rb b/app/workers/course_submission_mailer_worker.rb
@@ -2,6 +2,7 @@
 
 class CourseSubmissionMailerWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_email(course, instructor)
     perform_async(course.id, instructor.id)

diff --git a/app/workers/delete_course_worker.rb b/app/workers/delete_course_worker.rb
@@ -4,6 +4,7 @@
 
 class DeleteCourseWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_deletion(course:, current_user:)
     perform_async(course.id, current_user.id)

diff --git a/app/workers/enroll_in_course_worker.rb b/app/workers/enroll_in_course_worker.rb
@@ -4,6 +4,7 @@
 
 class EnrollInCourseWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_edits(course:, editing_user:, enrolling_user:)
     perform_async(course.id, editing_user.id, enrolling_user.id)

diff --git a/app/workers/greet_students_worker.rb b/app/workers/greet_students_worker.rb
@@ -2,6 +2,7 @@
 
 class GreetStudentsWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_greetings(course, greeter)
     perform_async(course.id, greeter.id)

diff --git a/app/workers/notify_untrained_users_worker.rb b/app/workers/notify_untrained_users_worker.rb
@@ -4,6 +4,7 @@
 
 class NotifyUntrainedUsersWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_notifications(course:, notifying_user:)
     perform_async(course.id, notifying_user.id)

diff --git a/app/workers/remove_assignment_worker.rb b/app/workers/remove_assignment_worker.rb
@@ -4,6 +4,7 @@
 
 class RemoveAssignmentWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_edits(course:, editing_user:, assignment:)
     perform_async(course.id, editing_user.id, assignment.id)

diff --git a/app/workers/set_preferences_worker.rb b/app/workers/set_preferences_worker.rb
@@ -4,6 +4,7 @@
 
 class SetPreferencesWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_preference_setting(user:)
     perform_async(user.id)

diff --git a/app/workers/update_assignments_worker.rb b/app/workers/update_assignments_worker.rb
@@ -4,6 +4,7 @@
 
 class UpdateAssignmentsWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_edits(course:, editing_user:)
     perform_async(course.id, editing_user.id)

diff --git a/app/workers/update_course_worker.rb b/app/workers/update_course_worker.rb
@@ -4,6 +4,7 @@
 
 class UpdateCourseWorker
   include Sidekiq::Worker
+  sidekiq_options unique: :until_executed
 
   def self.schedule_edits(course:, editing_user:)
     perform_async(course.id, editing_user.id)