snapsync 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea592c2458f120d101b112422dbeb0dc5966dcb7
-  data.tar.gz: d1a5181d899385dfca5174b28d8d6c67b6dd2751
+  metadata.gz: 75228e89d473612d045f56e995ddc5492506a119
+  data.tar.gz: 476af2e900213d61aa7fd9c5d606f33ca33df4d8
 SHA512:
-  metadata.gz: da792693feec9b09f8e41105f36c2a5d3a72af5f05d63f434e0073be469c3b7852a1b836b39259eec4187529e61f9a108e155fb2c852cc2f07ace2424ef6ea24
-  data.tar.gz: c6daee2a0394602db608b73b2b1b98dce9fcc818842fb15f657a5723676076eceeb25f2557fea14edea1cd06ba24b47cf2db71630fad01acca24486bf8c9a425
+  metadata.gz: 2aafcd762a596944cf0d1997b92e2e3a74ff9daa19e706529ce6f26e4d697202c7223b0e80075cc1653a8ed0322173321bee62abf29fd573bf251cf579071eca
+  data.tar.gz: e3e0b871f358c5a76cfcaa09a5d3d88b8614dbcb623fbc91fa04f4d8232ce4fd8bf76539153c4ce3b319d699184f690efaddfc4dfa160220615b488676601975

data/Gemfile

@@ -2,6 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in snapsync.gemspec
 gemspec
-
-gem 'pry'
-gem 'pry-byebug'

data/bin/snapsync

@@ -1,3 +1,7 @@
 #! /usr/bin/env ruby
 require 'snapsync/cli'
-Snapsync::CLI.start(ARGV)
+begin
+    Snapsync::CLI.start(ARGV)
+rescue Interrupt
+    Snapsync.info "Interrupted by user"
+end

data/lib/snapsync.rb

@@ -8,6 +8,7 @@ require 'concurrent'
 
 require "snapsync/version"
 require "snapsync/exceptions"
+require 'snapsync/btrfs'
 require "snapsync/snapper_config"
 require "snapsync/snapshot"
 require "snapsync/local_target"

data/lib/snapsync/btrfs.rb

@@ -0,0 +1,49 @@
+module Snapsync
+    module Btrfs
+        class Error < RuntimeError
+            attr_reader :error_lines
+            def initialize(error_lines = Array.new)
+                @error_lines = error_lines
+            end
+
+            def pretty_print(pp)
+                pp.text message
+                pp.nest(2) do
+                    error_lines.each do |l|
+                        pp.breakable
+                        pp.text l.chomp
+                    end
+                end
+            end
+        end
+
+        def self.popen(*args, mode: 'r', raise_on_error: true, **options)
+            err_r, err_w = IO.pipe
+            result = IO.popen(['btrfs', *args, err: err_w, **options], mode) do |io|
+                err_w.close
+                yield(io)
+            end
+
+            if $?.success?
+                result
+            elsif raise_on_error
+                raise Error.new, "btrfs failed"
+            end
+
+        rescue Error => e
+            prefix = args.join(" ")
+            lines = err_r.readlines.map do |line|
+                "#{prefix}: #{line.chomp}"
+            end
+            raise Error.new(e.error_lines + lines), e.message, e.backtrace
+
+        ensure err_r.close
+        end
+
+        def self.run(*args, **options)
+            popen(*args, **options) do |io|
+                io.read
+            end
+        end
+    end
+end

data/lib/snapsync/local_sync.rb

@@ -111,54 +111,33 @@ module Snapsync
 
             start = Time.now
             bytes_transferred = nil
-            receive_status, send_status = nil
-            err_send_pipe_r, err_send_pipe_w = IO.pipe
-            err_receive_pipe_r, err_receive_pipe_w = IO.pipe
-            IO.popen(['btrfs', 'send', *parent_opt, src.subvolume_dir.to_s, err: err_send_pipe_w]) do |send_io|
-                err_send_pipe_w.close
-                IO.popen(['btrfs', 'receive', target_snapshot_dir.to_s, err: err_receive_pipe_w, out: '/dev/null'], 'w') do |receive_io|
-                    err_receive_pipe_w.close
-                    receive_io.sync = true
-                    bytes_transferred = copy_stream(send_io, receive_io, estimated_size: estimated_size)
-                end
-                receive_status = $?
-            end
-            send_status = $?
-
-            success = (receive_status.success? && send_status.success?)
-            if !send_status.success?
-                Snapsync.warn "btrfs send reported an error"
-                err_send_pipe_w.readlines.each do |line|
-                    Snapsync.warn "  #{line.chomp}"
-                end
-            end
-
-            if !receive_status.success?
-                Snapsync.warn "btrfs receive reported an error"
-                err_receive_pipe_w.readlines.each do |line|
-                    Snapsync.warn "  #{line.chomp}"
+            bytes_transferred =
+                Btrfs.popen('send', *parent_opt, src.subvolume_dir.to_s) do |send_io|
+                    Btrfs.popen('receive', target_snapshot_dir.to_s, mode: 'w', out: '/dev/null') do |receive_io|
+                        receive_io.sync = true
+                        copy_stream(send_io, receive_io, estimated_size: estimated_size)
+                    end
                 end
-            end
 
-            if success
-                Snapsync.info "Flushing data to disk"
-                IO.popen(["btrfs", "filesystem", "sync", target_snapshot_dir.to_s, err: '/dev/null']).read
-                duration = Time.now - start
-                rate = bytes_transferred / duration
-                Snapsync.info "Transferred #{human_readable_size(bytes_transferred)} in #{human_readable_time(duration)} (#{human_readable_size(rate)}/s)"
-                Snapsync.info "Successfully synchronized #{src.snapshot_dir}"
-                true
-            end
-
-        ensure
-            if !success
-                Snapsync.warn "Failed to synchronize #{src.snapshot_dir}, deleting target directory"
-                subvolume_dir = target_snapshot_dir + "snapshot"
-                if subvolume_dir.directory?
-                    IO.popen(["btrfs", "subvolume", "delete", subvolume_dir.to_s, err: '/dev/null']).read
-                end
+            Snapsync.info "Flushing data to disk"
+            Btrfs.run("filesystem", "sync", target_snapshot_dir.to_s)
+            duration = Time.now - start
+            rate = bytes_transferred / duration
+            Snapsync.info "Transferred #{human_readable_size(bytes_transferred)} in #{human_readable_time(duration)} (#{human_readable_size(rate)}/s)"
+            Snapsync.info "Successfully synchronized #{src.snapshot_dir}"
+            true
+
+        rescue Exception => e
+            Snapsync.warn "Failed to synchronize #{src.snapshot_dir}, deleting target directory"
+            subvolume_dir = target_snapshot_dir + "snapshot"
+            if subvolume_dir.directory?
+                Btrfs.run("subvolume", "delete", subvolume_dir.to_s)
+            end
+            if target_snapshot_dir.directory?
                 target_snapshot_dir.rmtree
             end
+
+            raise
         end
 
         def sync

data/lib/snapsync/snapshot.rb

@@ -78,7 +78,7 @@ module Snapsync
         # This is an estimate of the size required to send this snapshot using
         # the given snapshot as parent
         def size_diff_from(snapshot)
-            info = IO.popen(['btrfs', 'subvolume', 'show', snapshot.subvolume_dir.to_s, err: '/dev/null']).read
+            info = Btrfs.run('subvolume', 'show', snapshot.subvolume_dir.to_s)
             info =~ /Generation[^:]*:\s+(\d+)/
             size_diff_from_gen(Integer($1))
         end
@@ -89,7 +89,7 @@ module Snapsync
         end
 
         def size_diff_from_gen(gen)
-            new = IO.popen(['btrfs', 'subvolume', 'find-new', subvolume_dir.to_s, gen.to_s, err: '/dev/null']).read
+            new = Btrfs.run('subvolume', 'find-new', subvolume_dir.to_s, gen.to_s)
             new.split("\n").inject(0) do |size, line|
                 if line.strip =~ /len (\d+)/
                     size + Integer($1)

data/lib/snapsync/sync_all.rb

@@ -53,8 +53,17 @@ module Snapsync
                 end
                 begin
                     Sync.new(config, target, autoclean: autoclean?).run
+                rescue Interrupt
+                    raise
                 rescue Exception => e
                     Snapsync.warn "failed to synchronization #{config.name} on #{target.dir}"
+                    PP.pp(e, buffer = String.new)
+                    buffer.each_line do |line|
+                        Snapsync.warn "  #{line}"
+                    end
+                    e.backtrace.each do |line|
+                        Snapsync.debug "  #{line}"
+                    end
                 end
             end
         end

data/lib/snapsync/version.rb

@@ -1,3 +1,3 @@
 module Snapsync
-    VERSION = "0.1.8"
+    VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapsync
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Sylvain Joyeux
@@ -177,6 +177,7 @@ files:
 - install.sh
 - lib/snapsync.rb
 - lib/snapsync/auto_sync.rb
+- lib/snapsync/btrfs.rb
 - lib/snapsync/cleanup.rb
 - lib/snapsync/cli.rb
 - lib/snapsync/default_sync_policy.rb