mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 22:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Robustify starting of ssh connection to vm updater.

Browse Source 
Change-Id: Ia5e0042250da22cebadfd48d143f21597bcada5d

BUG=chromium-os:11716
TEST=Ran vm test and vm update scripts.

Review URL: http://codereview.chromium.org/6413019
This commit is contained in:
Chris Sosa 2011-02-07 09:02:22 -08:00
parent 93da99be03
commit 99768e8e12
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/cros_run_vm_test
View File

@ -31,8 +31,6 @@ find_common_sh
. "${SCRIPT_ROOT}/lib/cros_vm_constants.sh" || \ . "${SCRIPT_ROOT}/lib/cros_vm_constants.sh" || \
die "Unable to load cros_vm_constants.sh" die "Unable to load cros_vm_constants.sh"
MAX_RETRIES=3
get_default_board get_default_board
DEFINE_string board "$DEFAULT_BOARD" \ DEFINE_string board "$DEFAULT_BOARD" \
@ -88,8 +86,7 @@ done
trap stop_kvm EXIT trap stop_kvm EXIT
start_kvm "${FLAGS_image_path}" start_kvm "${FLAGS_image_path}"
info "Checking for ssh access to virtual machine." retry_until_ssh
retry_until_ssh ${MAX_RETRIES}
if [ -n "${FLAGS_verify_chrome_version}" ]; then if [ -n "${FLAGS_verify_chrome_version}" ]; then
info "Verifying version of Chrome matches what we expect." info "Verifying version of Chrome matches what we expect."

1
bin/cros_run_vm_update
View File

@ -50,6 +50,7 @@ eval set -- "${FLAGS_ARGV}"
trap stop_kvm EXIT trap stop_kvm EXIT
start_kvm "${FLAGS_vm_image_path}" start_kvm "${FLAGS_vm_image_path}"
retry_until_ssh
if [ -n "${FLAGS_update_image_path}" ]; then if [ -n "${FLAGS_update_image_path}" ]; then
IMAGE_ARGS="--image=$(readlink -f ${FLAGS_update_image_path})" IMAGE_ARGS="--image=$(readlink -f ${FLAGS_update_image_path})"

3
lib/cros_vm_lib.sh
View File

@ -100,10 +100,11 @@ function ssh_ping() {
# shutting down and restarting kvm. # shutting down and restarting kvm.
function retry_until_ssh() { function retry_until_ssh() {
local can_ssh_into=1 local can_ssh_into=1
local max_retries=3
local retries=0 local retries=0
ssh_ping && can_ssh_into=0 ssh_ping && can_ssh_into=0
while [ ${can_ssh_into} -eq 1 ] && [ ${retries} -lt ${1} ]; do while [ ${can_ssh_into} -eq 1 ] && [ ${retries} -lt ${max_retries} ]; do
echo "Failed to connect to virtual machine, retrying ... " >&2 echo "Failed to connect to virtual machine, retrying ... " >&2
stop_kvm || echo "Could not stop kvm. Retrying anyway." >&2 stop_kvm || echo "Could not stop kvm. Retrying anyway." >&2
start_kvm "${LIVE_VM_IMAGE}" start_kvm "${LIVE_VM_IMAGE}"