kamal-backup 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a381b9f627864fc652f6d23b5109d5a670d0a4808f075d0d129fa2292da0eac3
-  data.tar.gz: aedbd53cb4486c1b2cc440e7825129d4823c948e1d8fc387b9742f3179363a80
+  metadata.gz: 0ffce7c9bfda0a3f7bf1431000f0b0d9f517d532b0d0b37378879e53a320d622
+  data.tar.gz: f927f0c24744d0c62797831a9839aa557fee677ac04c0956a4cf5fc196702b3d
 SHA512:
-  metadata.gz: ca9c294db8d9d5445ca395f80d23d7cfa2d9eaaf26ab28e628f5ee264ef268758e7c03d504eea2cb98e54c72e3ba0f3cd999ececfe3c0475bbd434327f8244b5
-  data.tar.gz: 05b9046e125145ce936ab33812046aff5a69cc7286bafb355c12d323f91615b948689e6db11ec365e41457addceab11aeff1aaf38b99898793d1e743a6900d44
+  metadata.gz: 0b9e6b7a3c2386a7e09c199236bafaf57849a27dfe4dba95b3a0a8114bed4cfb134184e9cf4adcfd7536300add5df525742af032d8e8eb410f9355dea626b731
+  data.tar.gz: d1d747ccd9b1a86e13d43d812b0551eb6601780632f5f0556caa9cced544b3db75eca34ed825cb02d0922ac87b6604403faf0c3f1617e732343101f827ed02dd

data/lib/kamal_backup/app.rb

@@ -36,7 +36,7 @@ module KamalBackup
       return skipped_backup_result(started_at) unless force || backup_due?(started_at)
 
       restic.ensure_repository
-      databases.each { |database| database.backup(restic) }
+      databases.each { |database| backup_database(database) }
       restic.backup_paths(config.backup_paths, tags: ['type:files'])
 
       restic.prune if config.forget_after_backup?
@@ -210,6 +210,18 @@ module KamalBackup
 
     private
 
+    def backup_database(database)
+      database.backup(restic)
+    rescue CommandError => e
+      raise CommandError.new(
+        "database backup failed for #{database_config_name(database)}: #{e.message}",
+        command: e.command,
+        status: e.status,
+        stdout: e.stdout,
+        stderr: e.stderr
+      )
+    end
+
     def backup_due?(now)
       due_at = next_backup_at
       due_at.nil? || now >= due_at

data/lib/kamal_backup/command_output.rb

@@ -82,8 +82,10 @@ module KamalBackup
 
     def command_exit(context, status)
       runtime = Process.clock_gettime(Process::CLOCK_MONOTONIC) - context.fetch(:started_at)
-      result = status.to_i.zero? ? 'successful' : 'failed'
-      result_color = status.to_i.zero? ? :green : :red
+      # A command killed by a signal has no exit status, so nil is a failure.
+      successful = status&.zero?
+      result = successful ? 'successful' : 'failed'
+      result_color = successful ? :green : :red
 
       synchronize do
         flush_output_buffers(context)

data/lib/kamal_backup/restic.rb

@@ -11,6 +11,7 @@ require_relative 'private_tempfile'
 module KamalBackup
   class Restic
     RESTIC_ENV_PATTERN = /\A(?:RESTIC_|AWS_|B2_|AZURE_|GOOGLE_|RCLONE_|OS_|ST_|HP_|HTTP_|HTTPS_|NO_PROXY)/i
+    INCOMPLETE_SNAPSHOT_STATUS = 3
 
     attr_reader :config, :redactor
 
@@ -31,11 +32,13 @@ module KamalBackup
 
     def backup_stream(command, filename:, tags:)
       log("backing up stream as #{filename}")
-      run(
-        ['backup'] + host_args + ['--stdin-filename', filename] + tag_args(common_tags + tags) +
-          ['--stdin-from-command', '--'] + command.argv,
-        env: restic_env.merge(command.env)
-      )
+      without_incomplete_snapshot do
+        run(
+          ['backup'] + host_args + ['--stdin-filename', filename] + tag_args(common_tags + tags) +
+            ['--stdin-from-command', '--'] + command.argv,
+          env: restic_env.merge(command.env)
+        )
+      end
     end
 
     def backup_file(path, filename:, tags:)
@@ -46,34 +49,36 @@ module KamalBackup
       )
       log("backing up file content as #{filename}")
 
-      File.open(path, 'rb') do |file|
-        output = Command.output
-        context = output&.command_start(command, redactor: redactor)
-        Open3.popen3(command.env, *command.argv) do |stdin, stdout, stderr, wait_thread|
-          stdout_reader = Thread.new do
-            Command.collect_stream(stdout, command_output: output, context: context, stream: :stdout,
-                                           redactor: redactor)
-          end
-          stderr_reader = Thread.new do
-            Command.collect_stream(stderr, command_output: output, context: context, stream: :stderr,
-                                           redactor: redactor)
+      without_incomplete_snapshot do
+        File.open(path, 'rb') do |file|
+          output = Command.output
+          context = output&.command_start(command, redactor: redactor)
+          Open3.popen3(command.env, *command.argv) do |stdin, stdout, stderr, wait_thread|
+            stdout_reader = Thread.new do
+              Command.collect_stream(stdout, command_output: output, context: context, stream: :stdout,
+                                             redactor: redactor)
+            end
+            stderr_reader = Thread.new do
+              Command.collect_stream(stderr, command_output: output, context: context, stream: :stderr,
+                                             redactor: redactor)
+            end
+            copy_error = nil
+            begin
+              IO.copy_stream(file, stdin)
+            rescue Errno::EPIPE => e
+              copy_error = e
+            ensure
+              stdin.close unless stdin.closed?
+            end
+            out = stdout_reader.value
+            err = stderr_reader.value
+            status = wait_thread.value
+            output&.command_exit(context, status.exitstatus)
+            raise_command_error(command, status, out, err) unless status.success?
+            raise_stream_error(command, copy_error, out, err) if copy_error
+
+            CommandResult.new(stdout: out, stderr: err, status: status.exitstatus)
           end
-          copy_error = nil
-          begin
-            IO.copy_stream(file, stdin)
-          rescue Errno::EPIPE => e
-            copy_error = e
-          ensure
-            stdin.close unless stdin.closed?
-          end
-          out = stdout_reader.value
-          err = stderr_reader.value
-          status = wait_thread.value
-          output&.command_exit(context, status.exitstatus)
-          raise_command_error(command, status, out, err) unless status.success?
-          raise_stream_error(command, copy_error, out, err) if copy_error
-
-          CommandResult.new(stdout: out, stderr: err, status: status.exitstatus)
         end
       end
     rescue Errno::ENOENT => e
@@ -381,6 +386,33 @@ module KamalBackup
                                                                          stderr: e.message)
     end
 
+    # restic exits 3 when it could not read a source but saved a snapshot anyway.
+    # A dump that exits 0 without writing anything ends up here: the snapshot has
+    # no dump in it, yet it would become the latest one and use a retention slot.
+    def without_incomplete_snapshot
+      yield
+    rescue CommandError => e
+      raise unless e.status == INCOMPLETE_SNAPSHOT_STATUS
+
+      raise CommandError.new(
+        "#{e.message}\n#{discard_incomplete_snapshot(e.stdout)}",
+        command: e.command,
+        status: e.status,
+        stdout: e.stdout,
+        stderr: e.stderr
+      )
+    end
+
+    def discard_incomplete_snapshot(stdout)
+      snapshot = stdout[/snapshot (\h+) saved/, 1]
+      return 'restic may have saved an incomplete snapshot; check `kamal-backup list`.' unless snapshot
+
+      run(['forget', snapshot])
+      "Removed incomplete snapshot #{snapshot}."
+    rescue CommandError => e
+      "Could not remove incomplete snapshot #{snapshot}; run `restic forget #{snapshot}`: #{e.message}"
+    end
+
     def raise_command_error(command, status, stdout, stderr)
       raise CommandError.new(
         "command failed (#{status.exitstatus}): #{command.display(redactor)}\n#{redactor.redact_string(stderr)}",

data/lib/kamal_backup/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - crmne
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -110,7 +109,6 @@ dependencies:
         version: '0'
 description: Back up PostgreSQL, MySQL, SQLite, and file-backed Active Storage files
   into restic on a schedule, then run restore drills and produce review evidence.
-email:
 executables:
 - kamal-backup
 extensions: []
@@ -149,7 +147,6 @@ metadata:
   source_code_uri: https://github.com/crmne/kamal-backup
   changelog_uri: https://github.com/crmne/kamal-backup/releases
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Scheduled backups, restore drills, and evidence for Rails apps deployed with
   Kamal