iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7341 from hashicorp/fix_7325 

openstack WaitForImage: pass context for cancellation
This commit is contained in:
Megan Marsh 2019-02-25 09:30:36 -08:00 committed by GitHub
parent 05897c8653 b9411712eb
commit 3f7c4f7406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builder/openstack/step_create_image.go
View File

@ -19,7 +19,7 @@ type stepCreateImage struct {
UseBlockStorageVolume bool UseBlockStorageVolume bool
} }
func (s *stepCreateImage) Run(_ context.Context, state multistep.StateBag) multistep.StepAction { func (s *stepCreateImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
config := state.Get("config").(*Config) config := state.Get("config").(*Config)
server := state.Get("server").(*servers.Server) server := state.Get("server").(*servers.Server)
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
@ -84,7 +84,7 @@ func (s *stepCreateImage) Run(_ context.Context, state multistep.StateBag) multi
// Wait for the image to become ready // Wait for the image to become ready
ui.Say(fmt.Sprintf("Waiting for image %s (image id: %s) to become ready...", config.ImageName, imageId)) ui.Say(fmt.Sprintf("Waiting for image %s (image id: %s) to become ready...", config.ImageName, imageId))
if err := WaitForImage(imageClient, imageId); err != nil { if err := WaitForImage(ctx, imageClient, imageId); err != nil {
err := fmt.Errorf("Error waiting for image: %s", err) err := fmt.Errorf("Error waiting for image: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
@ -99,11 +99,14 @@ func (s *stepCreateImage) Cleanup(multistep.StateBag) {
} }
// WaitForImage waits for the given Image ID to become ready. // WaitForImage waits for the given Image ID to become ready.
func WaitForImage(client *gophercloud.ServiceClient, imageId string) error { func WaitForImage(ctx context.Context, client *gophercloud.ServiceClient, imageId string) error {
maxNumErrors := 10 maxNumErrors := 10
numErrors := 0 numErrors := 0
for { for {
if err := ctx.Err(); err != nil {
return err
}
image, err := images.Get(client, imageId).Extract() image, err := images.Get(client, imageId).Extract()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)