49c4f2adc6
When ActiveStorage::Record uses `connects_to` for read replica support, it creates a separate connection pool from ApplicationRecord. This causes `after_commit` callbacks to fire in non-deterministic order - the Attachment's `create_variants` callback can fire before the User model's upload callback completes, resulting in FileNotFoundError. The fix removes replica connection configuration from ActiveStorage::Record so it shares the same connection pool as application models, ensuring proper callback ordering. Also reverts test workarounds that were added to work around this issue, since the root cause is now fixed. See: https://github.com/rails/rails/issues/53694
38 lines
1.2 KiB
Ruby
38 lines
1.2 KiB
Ruby
ActiveSupport.on_load(:active_storage_blob) do
|
|
ActiveStorage::DiskController.after_action only: :show do
|
|
expires_in 5.minutes, public: true
|
|
end
|
|
end
|
|
|
|
# Don't configure replica connections for ActiveStorage::Record.
|
|
# When ActiveStorage uses `connects_to`, it creates a separate connection pool
|
|
# from ApplicationRecord. This causes after_commit callbacks to fire in
|
|
# non-deterministic order - the Attachment's create_variants callback can fire
|
|
# before the User model's upload callback, causing FileNotFoundError when
|
|
# using `process: :immediately` for variants.
|
|
# See: https://github.com/rails/rails/issues/53694
|
|
#
|
|
# ActiveSupport.on_load(:active_storage_record) do
|
|
# configure_replica_connections
|
|
# end
|
|
|
|
module ActiveStorageControllerExtensions
|
|
extend ActiveSupport::Concern
|
|
|
|
included do
|
|
before_action do
|
|
# Add script_name so that Disk Service will generate correct URLs for uploads
|
|
ActiveStorage::Current.url_options = {
|
|
protocol: request.protocol,
|
|
host: request.host,
|
|
port: request.port,
|
|
script_name: request.script_name
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
Rails.application.config.to_prepare do
|
|
ActiveStorage::BaseController.include ActiveStorageControllerExtensions
|
|
end
|