lvmsync 3.1.3 → 3.2.0

data/bin/lvmsync

@@ -28,7 +28,8 @@ include LVM::Helpers
 
 def main()
 	# Parse me some options
-	options = {}
+	options = { :rsh => "ssh" }
+
 	OptionParser.new do |opts|
 		opts.banner = "Usage: lvmsync [options]"
 		opts.separator ""
@@ -40,19 +41,35 @@ def main()
 		opts.on("--server", "Run in server mode (deprecated; use '--apply -' instead)") do |v|
 			options[:server] = true
 		end
+
 		opts.on("-v", "--[no-]verbose",
-		        "Run verbosely") { |v| options[:verbose] = true }
+		        "Run verbosely") { |v| options[:verbose] = v }
+
+		opts.on("-q", "--[no-]quiet",
+		        "Run quietly") { |v| options[:quiet] = v }
+
 		opts.on("-b <file>", "--snapback <file>",
 		        "Make a backup snapshot file on the destination") do |v|
 			options[:snapback] = v
 		end
+
 		opts.on("-a", "--apply <file>",
 		        "Apply mode: write the contents of a snapback file to a device") do |v|
 			options[:apply] = v
 		end
+
 		opts.on("-s", "--stdout", "Write output data to stdout rather than another lvmsync process") do |v|
 			options[:stdout] = true
 		end
+
+		opts.on("-r", "--data-source", "Read data blocks from a block device other than the snapshot origin") do |v|
+			options[:source] = v
+		end
+
+		opts.on("-e", "--rsh <command-string>", "Use specified command when invoking SSH") do |v|
+			options[:rsh] = v
+		end
+
 		opts.on("-V", "--version", "Print version of lvmsync") do |v|
 			begin
 				puts "lvmsync #{GVB.version}"
@@ -65,6 +82,11 @@ def main()
 		end
 	end.parse!
 
+	if options[:quiet] and options[:verbose]
+		$stderr.puts "I can't run quietly *and* verbosely at the same time!"
+		exit 1
+	end
+
 	if options[:apply]
 		if ARGV[0].nil?
 			$stderr.puts "No destination device specified."
@@ -73,7 +95,7 @@ def main()
 		options[:device] = ARGV[0]
 		run_apply(options)
 	elsif options[:server]
-		$stderr.puts "--server is deprecated; please use '--apply -' instead"
+		$stderr.puts "--server is deprecated; please use '--apply -' instead" unless opts[:quiet]
 		if (ARGV[0].nil?)
 			$stderr.puts "No destination block device specified.  WTF?"
 			exit 1
@@ -176,8 +198,6 @@ def run_client(opts)
 		exit 1
 	end
 
-	$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
 	# cache stay in sync with the actual state of the device.  As a result,
@@ -187,12 +207,15 @@ def run_client(opts)
 
 	snapback = opts[:snapback] ? "--snapback #{opts[:snapback]}" : ''
 
+	source = opts[:source] || lv.origin.path
+	$stderr.puts "Data source: #{source}" if opts[:verbose]
+
 	if opts[:stdout]
-		dump_changes(lv, $stdout, opts)
+		dump_changes(lv, source, $stdout, opts)
 	else
 		verbose = opts[:verbose] ? '-v' : ''
 		server_cmd = if desthost
-			"ssh #{desthost} lvmsync --apply - #{snapback} #{verbose} #{destdev}"
+			"#{opts[:rsh]} #{desthost} lvmsync --apply - #{snapback} #{verbose} #{destdev}"
 		else
 			"#{$0} --apply - #{snapback} #{verbose} #{destdev}"
 		end
@@ -201,24 +224,38 @@ def run_client(opts)
 		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
+			fds = [stdout_fd, stderr_fd]
+
+			dump_changes(lv, source, stdin_fd, opts) do
+				# Remember that this fires between *every* block sent to the
+				# receiver, so don't do anything particularly slow in here!
+				until (active_fds = IO.select(fds, [], [], 0)).nil?
+					active_fds[0].each do |fd|
 						begin
-							$stderr.puts "\e[2K\rremote:#{fd.readline}"
+							$stderr.puts "\e[2K\rremote:#{fd.readline}" unless opts[:quiet]
 						rescue EOFError, Errno::EPIPE
-							# lolwhateva
+							fd.close
+							fds.delete(fd)
 						end
 					end
 				end
 			end
+
 			stdin_fd.close
-			[stderr_fd, stdout_fd].each do |fd|
-				until fd.eof?
-					$stderr.puts "\e[2K\rremote:#{fd.readline}"
+
+			# Read any residual data that might be left in the stdout/stderr of
+			# the remote; we've got to do this with a timeout because of
+			# OpenSSH, which, when used in ControlMaster ("multiplexing") mode,
+			# holds open stderr, meaning that IO.select will never indicate
+			# that stderr is finished.
+			until (active_fds = IO.select(fds, [], [], 0.1)).nil?
+				active_fds[0].each do |fd|
+					begin
+						$stderr.puts "\e[2K\rremote:#{fd.readline}" unless opts[:quiet]
+					rescue EOFError, Errno::EPIPE
+						fd.close
+						fds.delete(fd)
+					end
 				end
 			end
 			exit_status = wait_thr.value if wait_thr
@@ -230,23 +267,23 @@ def run_client(opts)
 	end
 end
 
-def dump_changes(lv, outfd, opts)
+def dump_changes(snapshot, source, outfd, opts)
 	outfd.puts PROTOCOL_VERSION
 
 	start_time = Time.now
 	xfer_count = 0
 	xfer_size  = 0
 	total_size = 0
-	change_count = lv.changes.length
+	change_count = snapshot.changes.length
 
-	File.open(lv.origin.path, 'r') do |origindev|
-		lv.changes.each do |r|
+	File.open(source, 'r') do |origindev|
+		snapshot.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 #{lv.origin.path}" if opts[:verbose]
+			$stderr.puts "Seeking to #{r.first} in #{source}" if opts[:verbose]
 
 			origindev.seek(r.first, IO::SEEK_SET)
 
@@ -260,7 +297,7 @@ def dump_changes(lv, outfd, opts)
 			end
 
 			# Progress bar!
-			if xfer_count % 100 == 50
+			if xfer_count % 100 == 50 and !opts[:quiet]
 				$stderr.printf "\e[2K\rSending chunk %i of %i, %.2fMB/s",
 									xfer_count,
 									change_count,
@@ -274,11 +311,13 @@ def dump_changes(lv, outfd, opts)
 		total_size = origindev.tell
 	end
 
-	$stderr.printf "\rTransferred %i bytes in %.2f seconds\n",
-	               xfer_size, Time.now - start_time
+	unless opts[:quiet]
+		$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
+		$stderr.printf "You transferred your changes %.2fx faster than a full dd!\n",
+		               total_size.to_f / xfer_size
+	end
 end
 
 # Take a device name in any number of different formats and return a [VG, LV] pair.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lvmsync
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump
@@ -238,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1253006935794364430
+      hash: -3943591993715626870
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1253006935794364430
+      hash: -3943591993715626870
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23