lp:~smoser/ubuntu-on-ec2/ec2-publishing-scripts.detach-vol-cleanups
- Get this branch:
- bzr branch lp:~smoser/ubuntu-on-ec2/ec2-publishing-scripts.detach-vol-cleanups
Branch merges
- Ben Howard (community): Approve
-
Diff: 58 lines (+29/-13)1 file modifiedec2-image2ebs (+29/-13)
Branch information
Recent revisions
- 408. By Scott Moser
-
remove race condition in detach_vol
detach_vol had an issue where if the state of the image went from
'in-use' (or anything) to 'available' after we checked for the shortcut
path, but before the 'detach-vol' call was received, then it would
return failure.This now does:
* check state of vol
* if vol in 'available', return 0
* detach vol
* if detach failed
* check state
* if vol is available, return 0
* else return failureIt leaves in the 'detach-vol' by design as euca calls are just so much
faster. - 407. By Scott Moser
-
increase the wait time for a volume to go to 'available'
This increases the time after a 'detach-vol' command is made before it must be
in 'available' state dramatically. Previously we were issuing the command and
then checking 5 times with 3 second sleeps. Now, check 20 times with 5 second
sleeps.There have been I think 3 builds in the past week that have failed because we
didn't wait long enough for detach'd volume to become available.The one below is from oneiric desktop 20120105.
It shows that after 47 seconds the volume was not yet available, but then
within 63 seconds it was.sa-east-1:copied data to /dev/sdi
sa-east-1: Thu Jan 5 17:09:13 UTC 2012: detaching vol-1fa3d577
sa-east-1: Thu Jan 5 17:09:40 UTC 2012: after detach try 1/5, state=in-use
sa-east-1: Thu Jan 5 17:09:45 UTC 2012: after detach try 2/5, state=in-use
sa-east-1: Thu Jan 5 17:09:49 UTC 2012: after detach try 3/5, state=in-use
sa-east-1: Thu Jan 5 17:09:56 UTC 2012: after detach try 4/5, state=in-use
sa-east-1: Thu Jan 5 17:10:00 UTC 2012: after detach try 5/5, state=in-use
sa-east-1: after 5 waits, vol-1fa3d577, state=in-use (not 'available')
sa-east-1: Thu Jan 5 17:10:03 UTC 2012: cmd failed [1/5]: detach_vol vol-1fa3d577 /tmp/ec2-image2ebs. Q18bND/ vol_detach. info
sa-east-1: Thu Jan 5 17:10:18 UTC 2012: detaching vol-1fa3d577
Client.IncorrectState: Volume 'vol-1fa3d577'is in the 'available' state.
sa-east-1: failed to detach vol-1fa3d577
sa-east-1: Thu Jan 5 17:10:29 UTC 2012: cmd failed [2/5]: detach_vol vol-1fa3d577 /tmp/ec2-image2ebs. Q18bND/ vol_detach. info
sa-east-1: Thu Jan 5 17:10:44 UTC 2012: detaching vol-1fa3d577
Client.IncorrectState: Volume 'vol-1fa3d577'is in the 'available' state. - 406. By Scott Moser
-
publish-image: do not match ebs images when looking for instance-store
when looking for an existing image, we were searching like this:
/ubuntu.images/ ubuntu- natty-11. 04-i386- server- 20111003 which would match both
099720109477/ebs/ubuntu- images/ ubuntu- natty-11. 04-i386- server- 20111003
and
099720109477/ubuntu- images/ ubuntu- natty-11. 04-i386- server- 20111003 This changes the search to explicitly skip names matching the '/ebs/' token
- 405. By Scott Moser
-
alpha builds do not get version number
This reverts the change made in revision 398.
Alpha builds do not contain a version number, while beta and RC builds do. - 404. By Scott Moser
-
promote-daily: set XC2_XIMAGES_CACHE_D
This will benefit programs it calls by allowing them to share
a ximages cache. - 400. By Scott Moser
-
remove-image: fail on failure of ximages describe-images
actually, before we were failing just about all cases as we had
a dangling "||" at the end. - 399. By Scott Moser
-
clean-region-
obsolete: remove the value of --cache arg I failed to remove this in the previous commit. Ie:
--cache ${im_data}
got turned to
${im_data}
but both needed to be yanked.
Branch metadata
- Branch format:
- Branch format 6
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)