kamal-backup 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8276219db8c5d8aa820e85e0f289f87715889cb5ea18ae2c99e3e12bbfe6b9
-  data.tar.gz: 626824ed56029bf3b713676d3376ab38d571942ee3809e7cf18abbfde9c24a45
+  metadata.gz: 0ba0b661680e0b8885935b4697cc40052f1584a2c39b0646d2e939d5874f043a
+  data.tar.gz: 3ac2499e70f17ac20b30eaba0bc507e6558fbf1406d8423e32fb1f44c642e3b8
 SHA512:
-  metadata.gz: 75d362d35409c0447c29994a7bf4d23ac47d287fc88621eb46f32a56296537217cee76a28799983f45154361ecd61e4f553b609144969bed2b10016bf0ecc09c
-  data.tar.gz: e5f664a15123066441b940d945caed2335d8b50356acaa64d9ae6f49d87a7705894234e55db42ec6508aa188f727b01d4e4d4c71688ecd93b4dbf4c12d53ef5d
+  metadata.gz: 61ff158f87e67167f446b540af94a4193657bf02f8a435d7ffb9465092c32cde6a9b82b4a616fb8571454ddde085915a051be312748ef0d1e2c8647d80f159ee
+  data.tar.gz: e872f59bb07fa089fcf4477c6b2d1f315d8a6d1fed164366d52a8475753c90a951caf46b929ff71ec4b5056160b3f8f8661a833ce0c8ecfaa2a0269d2c03b253

data/lib/kamal_backup/app.rb

@@ -480,6 +480,10 @@ module KamalBackup
       config.validate_restic
       config.validate_database_backup
       config.validate_backup_paths
+      # Check writability up front. This used to be discovered only after
+      # restic had pulled the entire file snapshot, so a read-only mount cost a
+      # full download before failing — the wrong moment to learn about it.
+      config.backup_paths.each { |path| ensure_writable_restore_target(path) }
     end
 
     def validate_production_drill(file_target, database_name, sqlite_path)

data/lib/kamal_backup/databases/postgres.rb

@@ -34,6 +34,28 @@ module KamalBackup
         CommandSpec.new(argv: argv, env: current_connection)
       end
 
+      # Replace the target schema before restoring.
+      #
+      # pg_restore --clean emits DROP TABLE for each object in the dump, but
+      # PostgreSQL refuses to drop a table another table still references, and
+      # the dump's ordering cannot account for constraints that only exist in
+      # the target. Restoring over a schema Rails already created — which is
+      # every restore onto a freshly deployed host, since Kamal runs db:prepare
+      # on boot — leaves the drops failing, the CREATEs failing as "already
+      # exists", the COPYs never running, and the foreign keys rejected because
+      # the tables they point at are still empty.
+      #
+      # Dropping the schema first sidesteps the ordering problem entirely. This
+      # only runs for restore-to-current, which already means "replace this
+      # database"; scratch restores target a separate database and are
+      # untouched.
+      def restore_to_current(restic, snapshot, filename)
+        reset_current_schema
+        result = super
+        ensure_restore_reported_no_errors(result)
+        result
+      end
+
       def current_restore_command
         connection = current_connection
         database = connection.fetch('PGDATABASE')
@@ -61,6 +83,38 @@ module KamalBackup
 
       private
 
+      # pg_restore exits 0 even when individual objects fail, reporting only
+      # "errors ignored on restore: N" on stderr. A restore that half-applied
+      # and claimed success is worse than one that failed, because the damage
+      # is only discovered later, from the data.
+      def ensure_restore_reported_no_errors(result)
+        stderr = result.respond_to?(:stderr) ? result.stderr.to_s : ''
+        match = stderr.match(/errors ignored on restore:\s*(\d+)/i)
+        return if match.nil? || match[1].to_i.zero?
+
+        raise CommandError.new(
+          "pg_restore reported #{match[1]} ignored error(s); the database is only partially restored. " \
+          'Inspect the output above, resolve the cause, and restore again.',
+          command: current_restore_command,
+          stderr: stderr
+        )
+      end
+
+      def reset_current_schema
+        connection = current_connection
+        argv = ['psql', '--quiet', '--no-psqlrc', '--set', 'ON_ERROR_STOP=1', '--command', RESET_SCHEMA_SQL]
+        Command.capture(CommandSpec.new(argv: argv, env: connection), redactor: redactor)
+      rescue CommandError => e
+        raise CommandError.new(
+          "failed to reset the public schema before restoring: #{e.message}",
+          command: e.command,
+          stderr: e.stderr
+        )
+      end
+
+      RESET_SCHEMA_SQL = 'DROP SCHEMA IF EXISTS public CASCADE; CREATE SCHEMA public;'
+      private_constant :RESET_SCHEMA_SQL
+
       def validate_scratch_restore_target(target)
         raise ConfigurationError, 'scratch database must differ from the current PostgreSQL database' if current_connection.fetch('PGDATABASE') == target
 

data/lib/kamal_backup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KamalBackup
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - crmne