From 23766969e4df642dea41d371598d442f49efaf8c Mon Sep 17 00:00:00 2001 From: Peter Zhurba Date: Fri, 6 May 2016 17:40:17 +0300 Subject: [PATCH] Add new flag migrate process finishing. For qa test it is necessary to determine when migration process finished. For this purposes /not_ready was used. But it has some disadvantages, it covers not whole migration process. And there was possibility to mistake. So was added new flag which appears after finishing of migration. Old was left because of old tests. Both of them are used only for testing propouses and don't affect migration process. Partial-Bug: #1576276 Change-Id: I49b62dc743111cb4c41489c528e48f8d56c2f9df (cherry picked from commit ecf9c0d908ece88f21202e59c17109ec098321a7) --- files/fuel-migrate/fuel-migrate | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/files/fuel-migrate/fuel-migrate b/files/fuel-migrate/fuel-migrate index a215e0a862..0b80e69832 100755 --- a/files/fuel-migrate/fuel-migrate +++ b/files/fuel-migrate/fuel-migrate @@ -465,7 +465,7 @@ EOF # refresh log on destination node rsync ${migrate_log} ${admin_net_ip}:${migrate_log} - ssh "${admin_net_ip}" rm -f /notready + ssh "${admin_net_ip}" "rm -f /notready; touch /tmp/migration-done" while true ; do sleep 3600 ; done else @@ -496,7 +496,7 @@ else # trap unexpected exit trap "{ set +x ; flock -u $fd ; cecho \"ERROR: look at ${migrate_log}\"; tail ${migrate_log} >&6; exit ; }" EXIT - + rm -f /tmp/migration-done max_worktime="${max_worktime:-7200}" fuel_astute="${fuel_astute:-/etc/fuel/astute.yaml}" nailgun_setting="${nailgun_setting:-/etc/nailgun/settings.yaml}" @@ -528,7 +528,6 @@ else os_varlibdocker="${os_varlibdocker:-30%}" os_varlog="${os_varlog:-100%}" del_vm=${del_vm:-no} - create_vm mark_dst_disk mk_lvs_fs