lvmsync 3.0.0 → 3.1.0

data/bin/lvmsync

@@ -19,6 +19,7 @@
 #
 require 'optparse'
 require 'lvm'
+require 'git-version-bump'
 
 PROTOCOL_VERSION = "lvmsync PROTO[3]"
 
@@ -30,8 +31,9 @@ def main()
 	OptionParser.new do |opts|
 		opts.banner = "Usage: lvmsync [options]"
 		opts.separator ""
-		opts.separator "    lvmsync [--snapback <file>] <snapshot device> [--stdout | [<desthost>:]<destdevice>]"
-		opts.separator "    lvmsync [--snapback <file>] --apply <changes file> <destdevice>"
+		opts.separator "    lvmsync [-v|--verbose] [--snapback <file>] <snapshot device> [--stdout | [<desthost>:]<destdevice>]"
+		opts.separator "    lvmsync [-v|--verbose] [--snapback <file>] --apply <changes file> <destdevice>"
+		opts.separator "    lvmsync <-V|--version>"
 		opts.separator ""
 
 		opts.on("--server", "Run in server mode (deprecated; use '--apply -' instead)") do |v|
@@ -50,6 +52,16 @@ def main()
 		opts.on("-s", "--stdout", "Write output data to stdout rather than another lvmsync process") do |v|
 			options[:stdout] = true
 		end
+		opts.on("-V", "--version", "Print version of lvmsync") do |v|
+			begin
+				puts "lvmsync #{GVB.version}"
+				exit 0
+			rescue GVB::VersionUnobtainable
+				$stderr.puts "Unable to determine lvmsync version."
+				$stderr.puts "Install lvmsync as a gem, or run it from within a git checkout"
+				exit 1
+			end
+		end
 	end.parse!
 
 	if options[:apply]

data/lib/lvm/helpers.rb

@@ -3,16 +3,25 @@ module LVM; end
 module LVM::Helpers
 	# Are we on a big-endian system?  Needed for our htonq/ntohq methods
 	def big_endian?
-		@bigendian ||= [1].pack("s") == [1].pack("n")
+		@big_endian ||= [1].pack("s") == [1].pack("n")
 	end
 
 	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 : ([val].pack("Q").reverse.unpack("Q").first)
+		big_endian? ? val : swap_longs(val)
 	end
 
 	def ntohq val
-		htonq val
+		big_endian? ? val : swap_longs(val)
+	end
+
+	# On-disk (LVM) format (which is little-endian) to host byte order
+	def dtohq val
+		big_endian? ? swap_longs(val) : val
+	end
+
+	def swap_longs val
+		[val].pack("Q").reverse.unpack("Q").first
 	end
 end

data/lib/lvm/snapshot.rb

@@ -30,15 +30,15 @@ class LVM::Snapshot
 
 				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
+					# sets; within each <blocklist>, it's little-endian 64-bit block
 					# IDs -- the first is the location (chunk_size * offset) in the origin
 					# LV that the data has been changed, the second is the location (again,
 					# chunk_size * offset) in the metadata LV where the changed data is
 					# being stored.
 					(chunk_size / 16).times do
 						origin_offset, snap_offset = metafd.read(16).unpack("QQ")
-						origin_offset = ntohq(origin_offset)
-						snap_offset   = ntohq(snap_offset)
+						origin_offset = dtohq(origin_offset)
+						snap_offset   = dtohq(snap_offset)
 
 						# A snapshot offset of 0 would point back to the metadata
 						# device header, so that's clearly invalid -- hence it's the

metadata

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