lvmsync 1.0.0 → 1.0.1

data/README.md

@@ -114,11 +114,11 @@ commands should be run on `vmsrv1`:
 
     # Shutdown the VM -- the command you use will probably vary
     virsh shutdown somevm
-    
+
     # Once it's shutdown and the block device isn't going to be written to
     # any more, then you can run lvmsync
     lvmsync /dev/vmsrv1/somevm-lvmsync vmsrv2:/dev/vmsrv2/somevm
-    
+
     # You can now start up the VM on vmsrv2, after a fairly small period of
     # downtime.  Once you're done, you can remove the snapshot and,
     # presumably, the LV itself, from `vmsrv1`
@@ -231,7 +231,7 @@ you'd do it like this:
 
 You can also do things like do an lvmsync *from* the destination -- this is
 useful if (for example) you can SSH from the destination to the source
-machine, but not the other way around (fkkn firewalls, how do they work?). 
+machine, but not the other way around (fkkn firewalls, how do they work?).
 You could do this by running something like the following on the destination
 machine:
 
@@ -248,7 +248,7 @@ order to work lvmsync.
 First, a little bit of background about how snapshot LVs work, before I
 describe how lvmsync makes use of them.
 
-An LVM snapshot "device" is actually not a block device in the usual sense. 
+An LVM snapshot "device" is actually not a block device in the usual sense.
 It isn't just a big area of disk space where you write things.  Instead, it
 is a "meta" device, which points to both an "origin" LV, which is the LV
 from which the snapshot was made, and a "metadata" LV, which is where the

data/bin/lvmsync

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 # Transfer a set of changes made to the origin of a snapshot LV to another
 # block device, possibly using SSH to send to a remote system.
@@ -33,7 +33,7 @@ def main()
 		opts.separator "    lvmsync [--snapback <file>] <snapshot device> [--stdout | [<desthost>:]<destdevice>]"
 		opts.separator "    lvmsync [--snapback <file>] --apply <changes file> <destdevice>"
 		opts.separator ""
-		
+
 		opts.on("--server", "Run in server mode (deprecated; use '--apply -' instead)") do |v|
 			options[:server] = true
 		end
@@ -51,7 +51,7 @@ def main()
 			options[:stdout] = true
 		end
 	end.parse!
-	
+
 	if options[:apply]
 		if ARGV[0].nil?
 			$stderr.puts "No destination device specified."
@@ -98,7 +98,7 @@ def run_apply(opts)
 	snapfile = opts[:snapback] ? File.open(opts[:snapback], 'w') : nil
 	infile   = opts[:apply] == '-' ? $stdin : File.open(opts[:apply], 'r')
 	destdev  = opts[:device]
-	
+
 	process_dumpdata(infile, destdev, snapfile)
 ensure
 	snapfile.close unless snapfile.nil?
@@ -116,7 +116,7 @@ def process_dumpdata(instream, destdev, snapback = nil)
 		while header = instream.read(12)
 			offset, chunksize = header.unpack("QN")
 			offset = ntohq(offset)
-			
+
 			begin
 				dest.seek offset * chunksize
 			rescue Errno::EINVAL
@@ -126,13 +126,13 @@ def process_dumpdata(instream, destdev, snapback = nil)
 				# seek past the end of the device.  Yes, this may lose data, but
 				# if you didn't notice that your dd shit itself, it's unlikely
 				# you're going to notice now.
-				
+
 				# Skip the chunk of data
 				instream.read(chunksize)
 				# Go to the next chunk
 				next
 			end
-			
+
 			if snapback
 				snapback.write(header)
 				snapback.write dest.read(chunksize)
@@ -148,16 +148,16 @@ def run_client(opts)
 	desthost = opts[:desthost]
 	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"
 		exit 1
 	end
-	
+
 	snap = if vgconfig.logical_volumes[lv].snapshot?
 		if vgconfig.logical_volumes[lv].thin?
 			LVM::ThinSnapshot.new(vg, lv)
@@ -170,11 +170,11 @@ def run_client(opts)
 	end
 
 	$stderr.puts "Origin device: #{vg}/#{snap.origin}" 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
 	# cache stay in sync with the actual state of the device.  As a result,
-	# we have to manually drop all caches before the data looks consistent. 
+	# we have to manually drop all caches before the data looks consistent.
 	# PERFORMANCE WIN!
 	File.open("/proc/sys/vm/drop_caches", 'w') { |fd| fd.print "3" }
 
@@ -188,12 +188,12 @@ def run_client(opts)
 		else
 			"lvmsync --apply - #{snapback} #{destdev}"
 		end
-		
+
 		outfd = IO.popen(server_cmd, 'w')
 	end
-	
+
 	outfd.puts PROTOCOL_VERSION
-	
+
 	start_time = Time.now
 	xfer_count = 0
 	xfer_size  = 0
@@ -205,10 +205,10 @@ def run_client(opts)
 			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]
-			
+
 			origindev.seek(r.first, IO::SEEK_SET)
 
 			outfd.print [htonq(r.first), chunk_size].pack("QN")
@@ -230,7 +230,7 @@ def run_client(opts)
 
 	$stderr.printf "\rTransferred %i bytes in %.2f seconds\n",
 	               xfer_size, Time.now - start_time
-	               
+
 	$stderr.printf "You transferred your changes %.2fx faster than a full dd!\n",
 	               total_size.to_f / xfer_size
 ensure

data/lib/lvm/helpers.rb

@@ -13,6 +13,6 @@ module LVM::Helpers
 	end
 
 	def ntohq val
-		htonq val 
+		htonq val
 	end
 end

data/lib/lvm/lv_config.rb

@@ -2,17 +2,17 @@ module LVM; end
 
 class LVM::LVConfig
 	attr_reader :name
-	
+
 	def initialize(tree, name, vgcfg)
 		@root = tree
 		@name = name
 		@vgcfg = vgcfg
 	end
-	
+
 	def thin?
 		@root.groups['segment1'].variable_value('type') == 'thin'
 	end
-	
+
 	def snapshot?
 		thin? ? !origin.nil? : !@vgcfg.logical_volumes.values.find { |lv| lv.cow_store == name }.nil?
 	end
@@ -32,7 +32,7 @@ class LVM::LVConfig
 	def cow_store
 		@root.groups['segment1'].variable_value('cow_store')
 	end
-	
+
 	def chunk_size
 		@root.groups['segment1'].variable_value('chunk_size') * 512
 	end

data/lib/lvm/snapshot.rb

@@ -5,7 +5,7 @@ module LVM; end
 
 class LVM::Snapshot
 	include LVM::Helpers
-	
+
 	def initialize(vg, lv)
 		@vg = vg
 		@lv = lv
@@ -18,16 +18,16 @@ class LVM::Snapshot
 			# For a regular, old-skool snapshot, getting the differences is
 			# pretty trivial -- just read through the snapshot metadata, and
 			# the list of changed blocks is right there.
-			# 
+			#
 			diff_block_list = []
 
 			File.open(metadata_device, 'r') do |metafd|
 				in_progress = true
-				
+
 				# The first chunk of the metadata LV is the header, which we
 				# don't care for at all
 				metafd.seek chunk_size, IO::SEEK_SET
-				
+
 				while in_progress
 					# The snapshot on-disk format is a stream of <blocklist>, <blockdata>
 					# sets; within each <blocklist>, it's network-byte-order 64-bit block
@@ -39,7 +39,7 @@ class LVM::Snapshot
 						origin_offset, snap_offset = metafd.read(16).unpack("QQ")
 						origin_offset = ntohq(origin_offset)
 						snap_offset   = ntohq(snap_offset)
-						
+
 						# A snapshot offset of 0 would point back to the metadata
 						# device header, so that's clearly invalid -- hence it's the
 						# "no more blocks" indicator.
@@ -47,21 +47,21 @@ class LVM::Snapshot
 							in_progress = false
 							break
 						end
-						
+
 						diff_block_list << origin_offset
 					end
-					
+
 					# We've read through a set of origin => data mappings; now we need
 					# to take a giant leap over the data blocks that follow it.
 					metafd.seek chunk_size * chunk_size / 16, IO::SEEK_CUR
 				end
 			end
-						
+
 			# Block-to-byte-range is pretty trivial, and we're done!
 			diff_block_list.map do |b|
 				((b*chunk_size)..(((b+1)*chunk_size)-1))
 			end
-			
+
 			# There is one optimisation we could make here that we haven't --
 			# coalescing adjacent byte ranges into single larger ranges.  I haven't
 			# done it for two reasons: Firstly, I don't have any idea how much of a
@@ -69,44 +69,44 @@ class LVM::Snapshot
 			# to do it elegantly.  So I punted.
 		end
 	end
-	
+
 	def origin
 		# Man old-skool snapshots are weird
 		vgcfg.logical_volumes.values.find { |lv| lv.cow_store == @lv }.origin
 	end
-	
+
 	private
 	def vgcfg
 		@vgcfg ||= LVM::VGConfig.new(@vg)
 	end
-	
+
 	def chunk_size
 		@chunk_size ||= metadata_header[:chunk_size]
 	end
-	
+
 	def metadata_header
 		@metadata_header ||= begin
 			magic, valid, version, chunk_size = File.read(metadata_device, 16).unpack("VVVV")
-			
+
 			unless magic == 0x70416e53
 				raise RuntimeError,
 				      "#{@vg}/#{@lv}: Invalid snapshot magic number"
 			end
-			
+
 			unless valid == 1
 				raise RuntimeError,
 				      "#{@vg}/#{@lv}: Snapshot is marked as invalid"
 			end
-			
+
 			unless version == 1
 				raise RuntimeError,
 				      "#{@vg}/#{@lv}: Incompatible snapshot metadata version"
 			end
-			
+
 			{ :chunk_size => chunk_size * 512 }
 		end
 	end
-	
+
 	def metadata_device
 		"/dev/mapper/#{@vg}-#{@lv}-cow"
 	end

data/lib/lvm/thin_snapshot.rb

@@ -69,19 +69,19 @@ class LVM::ThinSnapshot
 			diff_maps = ((flat_origin_blocklist - flat_snapshot_blocklist) +
 							 (flat_snapshot_blocklist - flat_origin_blocklist)
 							).uniq
-			
+
 			# At this point, we're off to a good start -- we've got the mappings
 			# that are different.  But we're not actually interested in the
 			# mappings themselves -- all we want is "the list of LV blocks which
 			# are different" (we'll translate LV blocks into byte ranges next).
 			#
 			changed_blocks = diff_maps.map { |m| m[0] }.uniq
-			
+
 			# Block-to-byte-range is pretty trivial, and we're done!
 			changed_blocks.map do |b|
 				((b*chunk_size)..(((b+1)*chunk_size)-1))
 			end
-			
+
 			# There is one optimisation we could make here that we haven't --
 			# coalescing adjacent byte ranges into single larger ranges.  I haven't
 			# done it for two reasons: Firstly, I don't have any idea how much of a
@@ -89,44 +89,44 @@ class LVM::ThinSnapshot
 			# to do it elegantly.  So I punted.
 		end
 	end
-	
+
 	def origin
 		@origin ||= vgcfg.logical_volumes[@lv].origin
 	end
-	
+
 	private
 	def vgcfg
 		@vgcfg ||= LVM::VGConfig.new(@vg)
 	end
-	
+
 	def flat_origin_blocklist
 		@flat_origin_blocklist ||= flatten_blocklist(origin_blocklist)
 	end
-	
+
 	def flat_snapshot_blocklist
 		@flat_snapshot_blocklist ||= flatten_blocklist(snapshot_blocklist)
 	end
-	
+
 	def origin_blocklist
 		@origin_blocklist ||= vg_block_dump[@vgcfg.logical_volumes[origin].device_id]
 	end
-	
+
 	def snapshot_blocklist
 		@snapshot_blocklist ||= vg_block_dump[@vgcfg.logical_volumes[@lv].device_id]
 	end
-	
+
 	def thin_pool_name
 		@thin_pool_name ||= vgcfg.logical_volumes[@lv].thin_pool
 	end
-	
+
 	def thin_pool
 		@thin_pool ||= vgcfg.logical_volumes[thin_pool_name]
 	end
-	
+
 	def chunk_size
 		@chunk_size ||= thin_pool.chunk_size
 	end
-	
+
 	# Take a hash of <block-or-range> => <block-or-range> elements and turn
 	# it into an array of [block, block] pairs -- any <range> => <range>
 	# elements get expanded out into their constituent <block> => <block>
@@ -138,9 +138,9 @@ class LVM::ThinSnapshot
 			if elem[0].is_a? Range
 				lv_blocks = elem[0].to_a
 				data_blocks = elem[1].to_a
-				
+
 				# This will now produce an array of two-element arrays, which
-				# will itself be inside the top-level array that we're mapping. 
+				# will itself be inside the top-level array that we're mapping.
 				# A flatten(1) at the end will take care of that problem,
 				# though.
 				lv_blocks.inject([]) { |a, v| a << [v, data_blocks[a.length]] }
@@ -155,14 +155,14 @@ class LVM::ThinSnapshot
 			end
 		end.flatten(1)
 	end
-	
+
 	def vg_block_dump
 		@vg_block_dump ||= begin
 			doc = REXML::Document.new(`thin_dump /dev/mapper/#{@vg.gsub('-', '--')}-#{thin_pool_name.gsub('-','--')}_tmeta`)
-			
+
 			doc.elements['superblock'].inject({}) do |h, dev|
 				next h unless dev.node_type == :element
-				
+
 				maps = dev.elements[''].inject({}) do |h2, r|
 					next h2 unless r.node_type == :element
 

data/lib/lvm/vg_config.rb

@@ -23,50 +23,55 @@ class LVM::VGConfig
 			      "Cannot parse vgcfgbackup output: #{@parser.failure_reason}"
 		end
 	end
-	
+
 	def version
 		@version ||= @root.variable_value('version')
 	end
-	
+
 	def description
 		@description ||= @root.variable_value('description')
 	end
-	
+
 	def uuid
 		@uuid ||= volume_group.variable_value('id')
 	end
-	
+
 	def volume_group
 		@volume_group ||= @root.groups[@vg_name]
 	end
-	
+
 	def physical_volumes
 		@physical_volumes ||= volume_group.groups['physical_volumes'].groups.to_a.inject({}) { |h,v| h[v[0]] = LVM::PVConfig.new(v[1]); h }
 	end
-	
+
 	def logical_volumes
 		@logical_volumes ||= volume_group.groups['logical_volumes'].groups.to_a.inject({}) { |h,v| h[v[0]] = LVM::LVConfig.new(v[1], v[0], self); h }
 	end
-	
+
 	private
 	def vgcfgbackup_output
 		@vgcfgbackup_output ||= begin
+			out = nil
+
 			Tempfile.open('vg_config') do |tmpf|
 				cmd = "#{@vgcfgbackup_cmd} -f #{tmpf.path} #{@vg_name}"
-				Open3.popen3(cmd) do |stdin_fd, stdout_fd, stderr_fd, thr|
+				stdout = nil
+				stderr = nil
+				Open3.popen3(cmd) do |stdin_fd, stdout_fd, stderr_fd|
 					stdin_fd.close
 					stdout = stdout_fd.read
 					stderr = stderr_fd.read
-					exit_status = thr.value
-				
-					if exit_status != 0
-						raise RuntimeError,
-						      "Failed to run vgcfgbackup: #{stdout}\n#{stderr}"
-					end
 				end
-				
-				File.read(tmpf.path)
+
+				if $?.exitstatus != 0
+					raise RuntimeError,
+					      "Failed to run vgcfgbackup: #{stdout}\n#{stderr}"
+				end
+
+				out = File.read(tmpf.path)
 			end
+
+			out
 		end
 	end
 end

data/lib/vgcfgbackup.rb

@@ -1,30 +1,30 @@
 module VgCfgBackup
 	class Node < Treetop::Runtime::SyntaxNode
 	end
-	
+
 	class Group < Node
 		def name
 			self.elements[0].text_value
 		end
-		
+
 		def variables
 			self.elements[3].elements.select { |e| e.is_a? Variable }
 		end
-		
+
 		def variable_value(name)
 			self.variables.find { |v| v.name == name }.value rescue nil
 		end
-		
+
 		def groups
 			self.elements[3].elements.select { |e| e.is_a? Group }.inject({}) { |h,v| h[v.name] = v; h }
 		end
 	end
-	
+
 	class Config < Group
 		def name
 			nil
 		end
-		
+
 		def variables
 			self.elements.select { |e| e.is_a? Variable }
 		end
@@ -33,32 +33,32 @@ module VgCfgBackup
 			self.elements.select { |e| e.is_a? Group }.inject({}) { |h,v| h[v.name] = v; h }
 		end
 	end
-	
+
 	class Variable < Node
 		def name
 			self.elements[0].text_value
 		end
-		
+
 		def value
 			self.elements[2].value
 		end
 	end
-	
+
 	class VariableName < Node
 	end
-	
+
 	class Integer < Node
 		def value
 			self.text_value.to_i
 		end
 	end
-	
+
 	class String < Node
 		def value
 			self.elements[1].text_value
 		end
 	end
-	
+
 	class List < Node
 		def value
 			self.elements.find { |e| e.is_a?(String) }.map { |e| e.value }

data/lib/vgcfgbackup.treetop

@@ -6,31 +6,31 @@ grammar VgCfgBackup
 	rule variable
 		variable_name " = " (integer / string / list) <Variable>
 	end
-	
+
 	rule variable_name
 		[a-z0-9_]+ <VariableName>
 	end
-	
+
 	rule group
 		variable_name space "{" (variable / group / space / comment)+ "}" <Group>
 	end
-	
+
 	rule integer
 		[1-9] [0-9]* <Integer> / "0" <Integer>
 	end
-	
+
 	rule string
 		'"' [^"]* '"' <String>
 	end
-	
+
 	rule list
 		"[" space? ((string / integer) ", " / (string / integer))* space? "]" <List>
 	end
-	
+
 	rule space
 		[\s]+
 	end
-	
+
 	rule comment
 		"#" [^\n]*
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lvmsync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3927931017616602686
+      hash: -3361242777286472333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3927931017616602686
+      hash: -3361242777286472333
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23