lvmsync 1.0.2 → 3.0.0

data/bin/lvmsync

@@ -20,7 +20,7 @@
 require 'optparse'
 require 'lvm'
 
-PROTOCOL_VERSION = "lvmsync PROTO[2]"
+PROTOCOL_VERSION = "lvmsync PROTO[3]"
 
 include LVM::Helpers
 
@@ -112,13 +112,15 @@ def process_dumpdata(instream, destdev, snapback = nil)
 		exit 1
 	end
 
+	snapback.puts handshake if snapback
+
 	File.open(destdev, 'w+') do |dest|
 		while header = instream.read(12)
 			offset, chunksize = header.unpack("QN")
 			offset = ntohq(offset)
 
 			begin
-				dest.seek offset * chunksize
+				dest.seek offset
 			rescue Errno::EINVAL
 				# In certain rare circumstances, we want to transfer a block
 				# device where the destination is smaller than the source (DRBD
@@ -136,7 +138,7 @@ def process_dumpdata(instream, destdev, snapback = nil)
 			if snapback
 				snapback.write(header)
 				snapback.write dest.read(chunksize)
-				dest.seek offset * chunksize
+				dest.seek offset
 			end
 			dest.write instream.read(chunksize)
 		end
@@ -186,7 +188,7 @@ def run_client(opts)
 		server_cmd = if desthost
 			"ssh #{desthost} lvmsync --apply - #{snapback} #{destdev}"
 		else
-			"lvmsync --apply - #{snapback} #{destdev}"
+			"#{$0} --apply - #{snapback} #{destdev}"
 		end
 
 		outfd = IO.popen(server_cmd, 'w')

data/lib/lvm/helpers.rb

@@ -9,7 +9,7 @@ module LVM::Helpers
 	def htonq val
 		# This won't work on a nUxi byte-order machine, but if you have one of
 		# those, I'm guessing you've got bigger problems
-		big_endian? ? ([val].pack("Q").reverse.unpack("Q").first) : val
+		big_endian? ? val : ([val].pack("Q").reverse.unpack("Q").first)
 	end
 
 	def ntohq val

data/lib/lvm/snapshot.rb

@@ -108,6 +108,6 @@ class LVM::Snapshot
 	end
 
 	def metadata_device
-		"/dev/mapper/#{@vg}-#{@lv.gsub('-', '--')}-cow"
+		"/dev/mapper/#{@vg.gsub('-', '--')}-#{@lv.gsub('-', '--')}-cow"
 	end
 end

data/lib/lvm/thin_snapshot.rb

@@ -172,7 +172,7 @@ class LVM::ThinSnapshot
 						len = r.attribute('length').value.to_i
 						ori = r.attribute('origin_begin').value.to_i
 						dat = r.attribute('data_begin').value.to_i
-						h2[(dat..dat+len-1)] = (ori..ori+len-1)
+						h2[(ori..ori+len-1)] = (dat..dat+len-1)
 					end
 
 					h2

data/lib/lvm/vg_config.rb

@@ -63,10 +63,10 @@ class LVM::VGConfig
 					stdin_fd.close
 					stdout = stdout_fd.read
 					stderr = stderr_fd.read
-					exit_status = wait_thr.value
+					exit_status = wait_thr.value if wait_thr
 				end
 
-				if exit_status.exitstatus != 0
+				if (exit_status or $?).exitstatus != 0
 					raise RuntimeError,
 					      "Failed to run vgcfgbackup: #{stdout}\n#{stderr}"
 				end

data/lib/vgcfgbackup.treetop

@@ -8,7 +8,7 @@ grammar VgCfgBackup
 	end
 
 	rule variable_name
-		[a-z0-9_-]+ <VariableName>
+		[a-zA-Z0-9_.+-]+ <VariableName>
 	end
 
 	rule group

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lvmsync
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-05-30 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: 2970664606006248824
+      hash: -2530308162516167436
 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: 2970664606006248824
+      hash: -2530308162516167436
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23