Automatic merge of gitlab-org/gitlab-ce master

app/uploaders/records_uploads.rb

@@ -23,13 +23,23 @@ module RecordsUploads
       return unless model
       return unless file && file.exists?
 
-      Upload.transaction do
+      # MySQL InnoDB may encounter a deadlock if a deletion and an
+      # insert is in the same transaction due to its next-key locking
+      # algorithm, so we need to skip the transaction.
+      # https://gitlab.com/gitlab-org/gitlab-ce/issues/55161#note_131556351
+      if Gitlab::Database.mysql?
+        readd_upload
+      else
+        Upload.transaction { readd_upload }
+      end
+    end
+
+    def readd_upload
       uploads.where(path: upload_path).delete_all
       upload.delete if upload
 
       self.upload = build_upload.tap(&:save!)
     end
-    end
     # rubocop: enable CodeReuse/ActiveRecord
 
     def upload_path