It looks like the account you are trying to import already exists.
<% elsif @import.failed_due_to_invalid_export? %>The ZIP file isn't a Fizzy account export.
+<% elsif @import.failed_due_to_insufficient_space? %> +There wasn't enough storage space to process your import.
<% else %>This may be due to corrupted export data or a conflict with existing data. Please try again with a fresh export, or reach out for help if the problem persists.
<% end %> diff --git a/app/views/mailers/import_mailer/failed.text.erb b/app/views/mailers/import_mailer/failed.text.erb index 1895f0d5db..ae050abf9f 100644 --- a/app/views/mailers/import_mailer/failed.text.erb +++ b/app/views/mailers/import_mailer/failed.text.erb @@ -4,6 +4,8 @@ Unfortunately, we couldn't import your Fizzy account. It looks like the account you are trying to import already exists. <% elsif @import.failed_due_to_invalid_export? -%> The ZIP file isn't a Fizzy account export. +<% elsif @import.failed_due_to_insufficient_space? -%> +There wasn't enough storage space to process your import. <% else -%> This may be due to corrupted export data or a conflict with existing data. Please try again with a fresh export, or reach out for help if the problem persists. <% end -%> diff --git a/docs/docker-deployment.md b/docs/docker-deployment.md index 219bcab1da..4352e369e5 100644 --- a/docs/docker-deployment.md +++ b/docs/docker-deployment.md @@ -153,6 +153,17 @@ This is for convenience: typically when you self-host you'll be running a single If you do want to allow multiple accounts to be created in your instance, set `MULTI_TENANT=true` +## Importing an existing Fizzy account + +You can move an account between Fizzy instances by exporting it on the old instance and uploading the export zip to the new one during signup. + +Imports need free space: at least twice the export file's size, beyond the export itself, since the imported attachments roughly mirror the zip's contents. If there isn't enough, the import fails fast with "There wasn't enough storage space to process your import." — free up space (or grow the volume) and try again. If free space can't be determined, the check is skipped and the import proceeds. + +For very large exports: + +- Browser uploads pass through Thruster, which drops slow uploads after its read timeout (a 502 before the import ever starts). Raise `THRUSTER_HTTP_READ_TIMEOUT` (seconds) and recreate the container so the setting takes effect. +- `script/import-account` runs the import directly on the server from a zip already on disk, bypassing the browser upload entirely — handy for multi-gigabyte exports. + ## Example Here's an example of a `docker-compose.yml` that you could use to run Fizzy via `docker compose up` diff --git a/test/mailers/import_mailer_test.rb b/test/mailers/import_mailer_test.rb index 7407933539..555ceb828c 100644 --- a/test/mailers/import_mailer_test.rb +++ b/test/mailers/import_mailer_test.rb @@ -47,4 +47,15 @@ class ImportMailerTest < ActionMailer::TestCase assert_match "isn't a Fizzy account export", email.body.encoded end + + test "failed with insufficient_space reason" do + import = Account::Import.create!(account: Current.account, identity: identities(:david), status: :failed, failure_reason: :insufficient_space) + email = ImportMailer.failed(import) + + assert_emails 1 do + email.deliver_now + end + + assert_match "enough storage space", email.body.encoded + end end diff --git a/test/models/account/import_test.rb b/test/models/account/import_test.rb index c1e9c2f7cb..ebba9ae7ca 100644 --- a/test/models/account/import_test.rb +++ b/test/models/account/import_test.rb @@ -220,7 +220,66 @@ class Account::ImportTest < ActiveSupport::TestCase export_tempfile&.unlink end + test "check fails fast with a clear reason when free disk space is insufficient" do + import = import_with_attached_zip + import.stubs(:available_space).returns(import.file.blob.byte_size) + + error = assert_raises(Account::Import::InsufficientSpaceError) { import.check } + assert_match(/import needs ~.+ free, found/, error.message) + assert import.reload.failed_due_to_insufficient_space? + end + + test "check proceeds when free disk space cannot be determined" do + import = import_with_attached_zip + import.stubs(:available_space).returns(nil) + + assert_raises(ZipFile::InvalidFileError) { import.check } + assert import.reload.failed_due_to_invalid_export? + end + + test "process fails fast with a clear reason when free disk space is insufficient" do + import = import_with_attached_zip + import.stubs(:available_space).returns(import.file.blob.byte_size) + + assert_raises(Account::Import::InsufficientSpaceError) { import.process } + assert import.reload.failed_due_to_insufficient_space? + end + + test "resumed process skips the disk space preflight" do + import = import_with_attached_zip + import.stubs(:available_space).returns(import.file.blob.byte_size) + + assert_raises(ZipFile::InvalidFileError) { import.process(start: [ "Board", nil ]) } + assert import.reload.failed_due_to_invalid_export? + end + + test "available_space is indeterminate when df output is unparseable" do + import = import_with_attached_zip + import.stubs(:`).returns("Filesystem 1024-blocks Used Available Capacity Mounted on\n") + + assert_nil import.send(:available_space, "/tmp") + end + + test "available_space parses df output whose filesystem name contains spaces" do + import = import_with_attached_zip + import.stubs(:`).returns(<<~DF) + Filesystem 1024-blocks Used Available Capacity Mounted on + map auto home 1000000 250000 750000 25% /System/Volumes/Data/home + DF + + assert_equal 750_000 * 1024, import.send(:available_space, "/tmp") + end + private + def import_with_attached_zip + account = Account.create!(name: "Disk Check") + import = Account::Import.create!(account: account, identity: identities(:david)) + Current.set(account: account) do + import.file.attach(io: StringIO.new("not actually a zip"), filename: "export.zip", content_type: "application/zip") + end + import + end + def account_digest(account) { name: account.name,