# HG changeset patch
# User David Scott <[email protected]>
# Date 1262613887 0
# Node ID 8b109110ce33a0fa61dc9b4e1c4855740637000d
# Parent  5be4064ee1b3a48a813d2db79d367c140bd47e23
CA-35549: make it less likely that we hit the upgrade race by inserting a 30s 
delay in the xapi-rolling-upgrade 'stop' path.

A proper fix for this would either re-order the dbsync updates or would involve 
redesigning the way patches are GCed to make it generally more robust.

Signed-off-by: David Scott <[email protected]>

diff -r 5be4064ee1b3 -r 8b109110ce33 scripts/xapi-rolling-upgrade-miami
--- a/scripts/xapi-rolling-upgrade-miami        Thu Dec 24 16:40:15 2009 +0000
+++ b/scripts/xapi-rolling-upgrade-miami        Mon Jan 04 14:04:47 2010 +0000
@@ -24,6 +24,8 @@
     
   ;;
   stop)
+    logger -t upgrade "Sleeping for 30s"
+    sleep 30s
     for i in $($XE sr-list other-config:xenserver_tools_sr=true params=uuid 
--minimal | sed 's/,/ /g'); do
       echo Renaming $i
       $XE sr-param-set uuid=$i name-label="XenServer Tools" 
name-description="XenServer Tools ISOs"
1 file changed, 2 insertions(+)
scripts/xapi-rolling-upgrade-miami |    2 ++


# HG changeset patch
# User David Scott <[email protected]>
# Date 1262613887 0
# Node ID 8b109110ce33a0fa61dc9b4e1c4855740637000d
# Parent  5be4064ee1b3a48a813d2db79d367c140bd47e23
CA-35549: make it less likely that we hit the upgrade race by inserting a 30s delay in the xapi-rolling-upgrade 'stop' path.

A proper fix for this would either re-order the dbsync updates or would involve redesigning the way patches are GCed to make it generally more robust.

Signed-off-by: David Scott <[email protected]>

diff -r 5be4064ee1b3 -r 8b109110ce33 scripts/xapi-rolling-upgrade-miami
--- a/scripts/xapi-rolling-upgrade-miami	Thu Dec 24 16:40:15 2009 +0000
+++ b/scripts/xapi-rolling-upgrade-miami	Mon Jan 04 14:04:47 2010 +0000
@@ -24,6 +24,8 @@
     
   ;;
   stop)
+    logger -t upgrade "Sleeping for 30s"
+    sleep 30s
     for i in $($XE sr-list other-config:xenserver_tools_sr=true params=uuid --minimal | sed 's/,/ /g'); do
       echo Renaming $i
       $XE sr-param-set uuid=$i name-label="XenServer Tools" name-description="XenServer Tools ISOs"
_______________________________________________
xen-api mailing list
[email protected]
http://lists.xensource.com/mailman/listinfo/xen-api

Reply via email to