From 96d5e573516160a9d94171e5a71f5675a4619f23 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 24 Nov 2025 14:33:37 +0100 Subject: [PATCH] Revert "Increase HTTP read timeout for expensive S3 batch delete operation (#36971)" (#36996) --- app/lib/attachment_batch.rb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/lib/attachment_batch.rb b/app/lib/attachment_batch.rb index cf08fdcf52..374abfac49 100644 --- a/app/lib/attachment_batch.rb +++ b/app/lib/attachment_batch.rb @@ -112,17 +112,10 @@ class AttachmentBatch keys.each_slice(LIMIT) do |keys_slice| logger.debug { "Deleting #{keys_slice.size} objects" } - bucket.delete_objects( - { - delete: { - objects: keys_slice.map { |key| { key: key } }, - quiet: true, - }, - }, - { - http_read_timeout: [Paperclip::Attachment.default_options[:s3_options][:http_read_timeout], 120].max, - } - ) + bucket.delete_objects(delete: { + objects: keys_slice.map { |key| { key: key } }, + quiet: true, + }) rescue => e retries += 1