From 32c22955b9007ab0ea8151fd166af85da1597051 Mon Sep 17 00:00:00 2001 From: ruslandoga <67764432+ruslandoga@users.noreply.github.com> Date: Sat, 6 Apr 2024 16:27:55 +0800 Subject: [PATCH] use random s3 keys for imports to avoid collisions (sometimes makes the upload get stuck) --- lib/plausible_web/live/csv_import.ex | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/plausible_web/live/csv_import.ex b/lib/plausible_web/live/csv_import.ex index 5719e6ef2..9b9211d6c 100644 --- a/lib/plausible_web/live/csv_import.ex +++ b/lib/plausible_web/live/csv_import.ex @@ -204,11 +204,20 @@ defmodule PlausibleWeb.Live.CSVImport do defp presign_upload(entry, socket) do %{s3_url: s3_url, presigned_url: upload_url} = - Plausible.S3.import_presign_upload(socket.assigns.site_id, entry.client_name) + Plausible.S3.import_presign_upload(socket.assigns.site_id, random_suffix(entry.client_name)) {:ok, %{uploader: "S3", s3_url: s3_url, url: upload_url}, socket} end + defp random_suffix(filename) do + # based on Plug.Upload.path/2 + # https://github.com/elixir-plug/plug/blob/eabf0b9d43060c10663a9105cb1baf984d272a6c/lib/plug/upload.ex#L154-L159 + sec = Integer.to_string(:os.system_time(:second)) + rand = Integer.to_string(:rand.uniform(999_999_999_999)) + scheduler_id = Integer.to_string(:erlang.system_info(:scheduler_id)) + filename <> "-" <> sec <> "-" <> rand <> "-" <> scheduler_id + end + defp handle_progress(:import, entry, socket) do if entry.done? do {:noreply, process_imported_tables(socket)}