Skip to content
This repository was archived by the owner on Oct 21, 2022. It is now read-only.

Improve rsync transfer speeds #32

Open
amontalban wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve rsync transfer speeds #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be76c5c
Change rsync options to be able to run it without TTY and improve tra…
amontalban Sep 8, 2016
8011167
Merge remote-tracking branch 'upstream/master'
amontalban Feb 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/kitchen/transport/rsync.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def upload(locals, remote)
rsync_candidates = locals.select {|path| File.directory?(path) && File.basename(path) != 'cache' }
ssh_command = "ssh #{ssh_args.join(' ')}"
copy_identity
rsync_cmd = "/usr/bin/rsync -e '#{ssh_command}' -az#{logger.level == :debug ? 'vv' : ''} --delete #{rsync_candidates.join(' ')} #{@session.options[:user]}@#{@session.host}:#{remote}"
rsync_cmd = "/usr/bin/rsync -e '#{ssh_command}' -aH#{logger.level == :debug ? 'vv' : ''} --numeric-ids --delete #{rsync_candidates.join(' ')} #{@session.options[:user]}@#{@session.host}:#{remote}"
logger.debug("[rsync] Running rsync command: #{rsync_cmd}")
ret = []
time = Benchmark.realtime do
Expand Down Expand Up @@ -92,13 +92,16 @@ def copy_identity
end

def ssh_args
args = %W{ -o UserKnownHostsFile=/dev/null }
args = %W{ -T }
args += %W{ -o Compression=no }
args += %W{ -o UserKnownHostsFile=/dev/null }
args += %W{ -o StrictHostKeyChecking=no }
args += %W{ -o IdentitiesOnly=yes } if @options[:keys]
args += %W{ -o LogLevel=#{@logger.debug? ? "VERBOSE" : "ERROR"} }
args += %W{ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} } if @options.key? :forward_agent
Array(@options[:keys]).each { |ssh_key| args += %W{ -i #{ssh_key}} }
args += %W{ -p #{@session.options[:port]}}
args += %W{ -x }
end
end

Expand Down