From a480c40f811593f9dcfa61bba94113590c00afe0 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 29 Jan 2025 10:03:56 +0000 Subject: [PATCH] Revert "DEV: Upload assets to S3 in parallel (#30210)" (#31050) This reverts commit b9f8a77d9ba5222bbf55172092f0b235b92d1c85. Reverting while we work on adding error handling. At the moment, failures are logged, but the process still exits with status=0. --- lib/tasks/s3.rake | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake index 2f2c262629d..661eb360d14 100644 --- a/lib/tasks/s3.rake +++ b/lib/tasks/s3.rake @@ -193,16 +193,8 @@ task "s3:ensure_cors_rules" => :environment do end task "s3:upload_assets" => [:environment, "s3:ensure_cors_rules"] do - pool = - Concurrent::FixedThreadPool.new( - ENV["DISCOURSE_S3_UPLOAD_ASSETS_RAKE_THREAD_POOL_SIZE"] || Concurrent.processor_count, - ) - logger = Logger.new(STDOUT) - assets.each { |asset| pool.post { upload(*asset, logger:) } } - - pool.shutdown - pool.wait_for_termination + assets.each { |asset| upload(*asset, logger:) } end task "s3:expire_missing_assets" => :environment do