Reduce chances of race conditions when processing deleted toots (#9815)

* Reduce chances of race conditions when processing deleted toots

* Prevent race condition when processing deleted toots

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 2b238bc88e263240a2a42e9eb3e83a05fe548a44..f4cf7ceb5006b3e8a442b24d21ed9516fcaf384a 100644 (file)
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -5,10 +5,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   CONVERTED_TYPES = %w(Image Video Article Page).freeze
 
   def perform
-    return if delete_arrived_first?(object_uri) || unsupported_object_type? || invalid_origin?(@object['id'])
+    return if unsupported_object_type? || invalid_origin?(@object['id'])
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
+        return if delete_arrived_first?(object_uri)
+
         @status = find_existing_status
 
         if @status.nil?

diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index 8270fed1b20a6bbaa023aba9cc7c548a5431f5fa..ca3cf387e23d9724b83483e85681f03d5a40237b 100644 (file)
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -21,11 +21,13 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
   def delete_note
     return if object_uri.nil?
 
+    RedisLock.acquire(lock_options) do |_lock|
+      delete_later!(object_uri)
+    end
+
     @status   = Status.find_by(uri: object_uri, account: @account)
     @status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?
 
-    delete_later!(object_uri)
-
     return if @status.nil?
 
     if @status.public_visibility? || @status.unlisted_visibility?
@@ -68,4 +70,8 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
   def payload
     @payload ||= Oj.dump(@json)
   end
+
+  def lock_options
+    { redis: Redis.current, key: "create:#{object_uri}" }
+  end
 end