lvmsync 3.1.0 → 3.1.1

data/bin/lvmsync

@@ -20,6 +20,7 @@
 require 'optparse'
 require 'lvm'
 require 'git-version-bump'
+require 'open3'
 
 PROTOCOL_VERSION = "lvmsync PROTO[3]"
 
@@ -111,13 +112,13 @@ def run_apply(opts)
 	infile   = opts[:apply] == '-' ? $stdin : File.open(opts[:apply], 'r')
 	destdev  = opts[:device]
 
-	process_dumpdata(infile, destdev, snapfile)
+	process_dumpdata(infile, destdev, snapfile, opts)
 ensure
 	snapfile.close unless snapfile.nil?
 	infile.close unless infile.nil? or infile == $stdin
 end
 
-def process_dumpdata(instream, destdev, snapback = nil)
+def process_dumpdata(instream, destdev, snapback = nil, opts)
 	handshake = instream.readline.chomp
 	unless handshake == PROTOCOL_VERSION
 		$stderr.puts "Handshake failed; protocol mismatch? (saw '#{handshake}' expected '#{PROTOCOL_VERSION}'"
@@ -163,27 +164,19 @@ def run_client(opts)
 	destdev = opts[:destdev]
 	outfd = nil
 
-	vg, lv = parse_snapshot_name(snapshot)
-
-	vgconfig = LVM::VGConfig.new(vg)
-
-	if vgconfig.logical_volumes[lv].nil?
-		$stderr.puts "#{snapshot}: Could not find logical volume"
+	lv = begin
+		LVM::LogicalVolume.new(snapshot)
+	rescue RuntimeError => e
+		$stderr.puts "#{snapshot}: could not find logical volume (#{e.message})"
 		exit 1
 	end
 
-	snap = if vgconfig.logical_volumes[lv].snapshot?
-		if vgconfig.logical_volumes[lv].thin?
-			LVM::ThinSnapshot.new(vg, lv)
-		else
-			LVM::Snapshot.new(vg, lv)
-		end
-	else
+	unless lv.snapshot?
 		$stderr.puts "#{snapshot}: Not a snapshot device"
 		exit 1
 	end
 
-	$stderr.puts "Origin device: #{vg}/#{snap.origin}" if opts[:verbose]
+	$stderr.puts "Origin device: #{lv.origin.path}" if opts[:verbose]
 
 	# Since, in principle, we're not supposed to be reading from snapshot
 	# devices directly, the kernel makes no attempt to make the device's read
@@ -195,47 +188,82 @@ def run_client(opts)
 	snapback = opts[:snapback] ? "--snapback #{opts[:snapback]}" : ''
 
 	if opts[:stdout]
-		outfd = $stdout
+		dump_changes(lv, $stdout, opts)
 	else
+		verbose = opts[:verbose] ? '-v' : ''
 		server_cmd = if desthost
-			"ssh #{desthost} lvmsync --apply - #{snapback} #{destdev}"
+			"ssh #{desthost} lvmsync --apply - #{snapback} #{verbose} #{destdev}"
 		else
-			"#{$0} --apply - #{snapback} #{destdev}"
+			"#{$0} --apply - #{snapback} #{verbose} #{destdev}"
+		end
+
+		exit_status = nil
+		errors = nil
+
+		Open3.popen3(server_cmd) do |stdin_fd, stdout_fd, stderr_fd, wait_thr|
+			dump_changes(lv, stdin_fd, opts) do
+				more_to_read = true
+				while more_to_read
+					more_to_read = false
+					(IO.select([stdout_fd, stderr_fd], [], [], 0) || [[]])[0].each do |fd|
+						more_to_read = true
+						$stderr.puts "\e[2K\rremote:#{fd.readline}"
+					end
+				end
+			end
+			stdin_fd.close
+			[stderr_fd, stdout_fd].each do |fd|
+				until fd.eof?
+					$stderr.puts "\e[2K\rremote:#{fd.readline}"
+				end
+			end
+			exit_status = wait_thr.value if wait_thr
 		end
 
-		outfd = IO.popen(server_cmd, 'w')
+		if (exit_status or $?).exitstatus != 0
+			$stderr.puts "APPLY FAILED."
+		end
 	end
+end
 
+def dump_changes(lv, outfd, opts)
 	outfd.puts PROTOCOL_VERSION
 
 	start_time = Time.now
 	xfer_count = 0
 	xfer_size  = 0
 	total_size = 0
+	change_count = lv.changes.length
 
-	originfile = "/dev/mapper/#{vg.gsub('-', '--')}-#{snap.origin.gsub('-', '--')}"
-	File.open(originfile, 'r') do |origindev|
-		snap.differences.each do |r|
+	File.open(lv.origin.path, 'r') do |origindev|
+		lv.changes.each do |r|
 			xfer_count += 1
 			chunk_size = r.last - r.first + 1
 			xfer_size  += chunk_size
 
 			$stderr.puts "Sending chunk #{r.to_s}..." if opts[:verbose]
-			$stderr.puts "Seeking to #{r.first} in #{originfile}" if opts[:verbose]
+			$stderr.puts "Seeking to #{r.first} in #{lv.origin.path}" if opts[:verbose]
 
 			origindev.seek(r.first, IO::SEEK_SET)
 
-			outfd.print [htonq(r.first), chunk_size].pack("QN")
-			outfd.print origindev.read(chunk_size)
+			begin
+				outfd.print [htonq(r.first), chunk_size].pack("QN")
+				outfd.print origindev.read(chunk_size)
+			rescue Errno::EPIPE
+				$stderr.puts "Remote prematurely closed the connection"
+				yield if block_given?
+				return
+			end
 
 			# Progress bar!
 			if xfer_count % 100 == 50
 				$stderr.printf "\e[2K\rSending chunk %i of %i, %.2fMB/s",
 									xfer_count,
-									snap.differences.length,
+									change_count,
 									xfer_size / (Time.now - start_time) / 1048576
 				$stderr.flush
 			end
+			yield if block_given?
 		end
 
 		origindev.seek(0, IO::SEEK_END)
@@ -247,8 +275,6 @@ def run_client(opts)
 
 	$stderr.printf "You transferred your changes %.2fx faster than a full dd!\n",
 	               total_size.to_f / xfer_size
-ensure
-	outfd.close unless outfd.nil? or outfd == $stdout
 end
 
 # Take a device name in any number of different formats and return a [VG, LV] pair.

data/lib/lvm/logical_volume.rb

@@ -0,0 +1,83 @@
+module LVM; end
+
+# This class represents an LVM logical volume, in all its glory.  You can
+# perform various operations on it.
+class LVM::LogicalVolume
+	# Create a new instance of LVM::LogicalVolume.
+	#
+	# New instances can be created in one of two ways:
+	#
+	#  * Pass a single argument, containing any path which LVM can resolve to
+	#    a logical volume.  Typically, this will either be `/dev/<vg>/<lv>`
+	#    or `/dev/mapper/<vg>-<lv>`, but we don't try to parse it ourselves,
+	#    relying instead on `lvs` to do the heavy lifting.
+	#
+	#  * Pass two arguments, which are the volume group name and logical
+	#    volume name, respectively.
+	#
+	# This method will raise `RuntimeError` if the path specified can't be
+	# resolved to an LV, or if the specified VG name or LV name don't resolve
+	# to an active logical volume.
+	#
+	def initialize(path_or_vg_name, lv_name=nil)
+		if lv_name.nil?
+			path = path_or_vg_name
+			@vg_name, @lv_name = `lvs --noheadings -o vg_name,lv_name #{path} 2>/dev/null`.strip.split(/\s+/, 2)
+			if $?.exitstatus != 0
+				raise RuntimeError,
+				      "Failed to interrogate LVM about '#{path}'.  Perhaps you misspelt it?"
+			end
+		else
+			@vg_name = path_or_vg_name
+			@lv_name = lv_name
+		end
+
+		@vgcfg = LVM::VGConfig.new(@vg_name)
+		@lvcfg = @vgcfg.logical_volumes[@lv_name]
+
+		if @lvcfg.nil?
+			raise RuntimeError,
+			      "Logical volume #{@lv_name} does not exist in volume group #{@vg_name}"
+		end
+	end
+
+	# Return a string containing a canonical path to the block device
+	# representing this LV.
+	def path
+		"/dev/mapper/#{@vg_name.gsub('-', '--')}-#{@lv_name.gsub('-', '--')}"
+	end
+
+	# Is this LV a snapshot?
+	def snapshot?
+		@lvcfg.snapshot?
+	end
+
+	# Return an LVM::LogicalVolume object which is the origin volume of
+	# this one (if this LV is a snapshot), or `nil` otherwise.
+	def origin
+		return nil unless snapshot?
+
+		if @lvcfg.origin
+			LVM::LogicalVolume.new(@vg_name, @lvcfg.origin)
+		else
+			origin_lv_name = @vgcfg.logical_volumes.values.find { |lv| lv.cow_store == @lv_name }.origin
+			LVM::LogicalVolume.new(@vg_name, origin_lv_name)
+		end
+	end
+
+	# Return an array of ranges, each of which represents an inclusive range
+	# of bytes which are different between this logical volume and its
+	# origin.
+	#
+	# If this LV is not a snapshot, this method returns an empty array.
+	#
+	def changes
+		return [] unless snapshot?
+
+		if @lvcfg.thin?
+			LVM::ThinSnapshot.new(@vg_name, @lv_name)
+		else
+			LVM::Snapshot.new(@vg_name, @lv_name)
+		end.differences
+	end
+end

data/lib/lvm.rb

@@ -1,5 +1,6 @@
 require 'lvm/helpers'
 require 'lvm/thin_snapshot'
 require 'lvm/snapshot'
+require 'lvm/logical_volume'
 require 'lvm/lv_config'
 require 'lvm/vg_config'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lvmsync
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: treetop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,14 +44,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: treetop
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: github-release
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -200,6 +216,7 @@ files:
 - bin/lvmsync
 - lib/lvm.rb
 - lib/lvm/lv_config.rb
+- lib/lvm/logical_volume.rb
 - lib/lvm/thin_snapshot.rb
 - lib/lvm/snapshot.rb
 - lib/lvm/vg_config.rb
@@ -221,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3110588239684965704
+      hash: -3100396621721855174
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3110588239684965704
+      hash: -3100396621721855174
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23