From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 25 Mar 2008 13:00:50 +0000 (+0000)
Subject: vserver & ctx_migrate workaround : more numerous (20) attempts, wait for only 3 sec
X-Git-Tag: 4.2-rc2~110
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b3341034b0768d0a187eb60ad2c77c803b1bd306;p=build.git

vserver & ctx_migrate workaround : more numerous (20) attempts, wait for only 3 sec
---

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index dcfc15e8..47122fb0 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -89,10 +89,10 @@ function setup_vserver () {
     # try to work around the vserver issue:
     # vc_ctx_migrate: No such process
     # rpm-fake.so: failed to initialize communication with resolver
-    for i in 1 2 3 4 5 ; do
+    for i in $(seq 20) ; do
 	$personality vserver $VERBOSE $vserver build $VSERVER_OPTIONS -m yum -- -d $fcdistro && break || true
-	echo "Waiting for 30 seconds"
-	sleep 30
+	echo "* ${i}-th attempt to 'vserver build' failed - waiting for 3 seconds"
+	sleep 3
     done
     # check success
     [ -d /vservers/$vserver ] 
@@ -130,10 +130,10 @@ function setup_vserver () {
 
     $personality vyum $vserver -- -y install yum
     # ditto
-    for i in 1 2 3 4 5 ; do
+    for i in $(seq 20) ; do
 	$personality vserver $VERBOSE $vserver pkgmgmt internalize && break || true
-	echo "Waiting for 30 seconds"
-	sleep 30
+	echo "* ${i}-th attempt to 'vserver pkgmgmt internalize' failed - waiting for 3 seconds"
+	sleep 3
     done
 
     # start the vserver so we can do the following operations