Skip to content

MINOR: Apply extra serialized rsync step to both parallel and serial paths #3546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ewencp wants to merge 1 commit into from
Closed

MINOR: Apply extra serialized rsync step to both parallel and serial paths #3546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 17 additions & 15 deletions vagrant/vagrant-up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,31 +226,33 @@ function bring_up_aws {

if [[ ! -z "$worker_machines" ]]; then
echo "Bringing up test worker machines in parallel"
# Currently it seems that the AWS provider will always run
# rsync as part of vagrant up. However,
# https://github.com/mitchellh/vagrant/issues/7531 means
# it is not safe to do so. Since the bug doesn't seem to
# cause any direct errors, just missing data on some
# nodes, follow up with serial rsyncing to ensure we're in
# a clean state. Use custom TMPDIR values to ensure we're
# isolated from any other instances of this script that
# are running/ran recently and may cause different
# instances to sync to the wrong nodes
# Try to isolate this job in its own /tmp space. See note
# below about vagrant issue
local vagrant_rsync_temp_dir=$(mktemp -d);
TMPDIR=$vagrant_rsync_temp_dir vagrant_batch_command "vagrant up $debug --provider=aws" "$worker_machines" "$max_parallel"
rm -rf $vagrant_rsync_temp_dir
vagrant hostmanager
for worker in $worker_machines; do
local vagrant_rsync_temp_dir=$(mktemp -d);
TMPDIR=$vagrant_rsync_temp_dir vagrant rsync $worker;
rm -rf $vagrant_rsync_temp_dir
done
fi
else
vagrant up --provider=aws --no-parallel --no-provision $debug
vagrant hostmanager
vagrant provision
fi

# Currently it seems that the AWS provider will always run rsync
# as part of vagrant up. However,
# https://github.com/mitchellh/vagrant/issues/7531 means it is not
# safe to do so. Since the bug doesn't seem to cause any direct
# errors, just missing data on some nodes, follow up with serial
# rsyncing to ensure we're in a clean state. Use custom TMPDIR
# values to ensure we're isolated from any other instances of this
# script that are running/ran recently and may cause different
# instances to sync to the wrong nodes
for worker in $worker_machines; do
local vagrant_rsync_temp_dir=$(mktemp -d);
TMPDIR=$vagrant_rsync_temp_dir vagrant rsync $worker;
rm -rf $vagrant_rsync_temp_dir
done
}

function main {
Expand Down