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

Merge pull request #7989 from hashicorp/spot_regression_warning 

work around spot_tags related regression and bad fleet cleanup in spo…
This commit is contained in:
Megan Marsh 2019-08-14 11:29:22 -07:00 committed by GitHub
parent ce0f11a651 9f6d14c75a
commit e029c07b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builder/amazon/common/run_config.go
View File

@ -155,10 +155,18 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
}
if c.SpotTags != nil {
if c.SpotPrice == "" || c.SpotPrice == "0" {
errs = append(errs, fmt.Errorf(
"spot_tags should not be set when not requesting a spot instance"))
}
errs = append(errs, fmt.Errorf("the spot_tags option has suffered a"+
"regression in this "+
"version of Packer and will no longer properly tag the spot "+
"request; we hope to restore this functionality soon but if you "+
"need spot tags in the meantime, please revert to Packer v1.4.1 "+
"or lower. If you don't need spot_tags, just remove the spot_tags"+
"option from your Packer template and run again."+
"We're so sorry for the inconvenience."))
// if c.SpotPrice == "" || c.SpotPrice == "0" {
// errs = append(errs, fmt.Errorf(
// "spot_tags should not be set when not requesting a spot instance"))
// }
}
if c.UserData != "" && c.UserDataFile != "" {

76
builder/amazon/common/step_run_spot_instance.go
View File

@ -40,8 +40,7 @@ type StepRunSpotInstance struct {
UserDataFile string
Ctx interpolate.Context
instanceId string
spotRequest *ec2.SpotInstanceRequest
instanceId string
}
func (s *StepRunSpotInstance) CreateTemplateData(userData *string, az string,
@ -267,39 +266,53 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
ui.Error(err.Error())
return multistep.ActionHalt
}
spotTags.Report(ui)
if len(spotTags) > 0 && s.SpotTags.IsSet() {
err = retry.Config{
Tries: 11,
ShouldRetry: func(error) bool { return false },
RetryDelay: (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
}.Run(ctx, func(ctx context.Context) error {
_, err := ec2conn.CreateTags(&ec2.CreateTagsInput{
Tags: spotTags,
Resources: []*string{aws.String(req.RequestID)},
})
return err
})
if err != nil {
err := fmt.Errorf("Error tagging spot request: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
ui.Error("the spot_tags option has suffered a regression in this " +
"version of Packer and will no longer properly tag the spot " +
"request; we hope to restore this functionality soon but if you " +
"need spot tags in the meantime, please revert to Packer v1.4.1 " +
"or lower. Sorry for the inconvenience.")
// TODO: restore spot tag functionality or revert fleet functionality.
// Investigate whether we can do what we need using an async fleet
// instead of an "instant" one.
// spotTags.Report(ui)
// err = retry.Config{
// Tries: 11,
// ShouldRetry: func(error) bool { return false },
// RetryDelay: (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
// }.Run(ctx, func(ctx context.Context) error {
// _, err := ec2conn.CreateTags(&ec2.CreateTagsInput{
// Tags: spotTags,
// Resources: []*string{aws.String(req.RequestID)},
// })
// return err
// })
// if err != nil {
// err := fmt.Errorf("Error tagging spot request: %s", err)
// state.Put("error", err)
// ui.Error(err.Error())
// return multistep.ActionHalt
// }
}
// Actually send the spot connection request.
err = req.Send()
if err != nil {
err := fmt.Errorf("Error waiting for spot request (%s) to become ready: %s", req.RequestID, err)
err := fmt.Errorf("Error waiting for fleet request (%s): %s", *createOutput.FleetId, err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
if len(createOutput.Errors) > 0 {
err := fmt.Errorf("error sending spot request: %s", *createOutput.Errors[0])
errString := fmt.Sprintf("Error waiting for fleet request (%s) to become ready:", *createOutput.FleetId)
for _, outErr := range createOutput.Errors {
errString = errString + fmt.Sprintf("%s", *outErr.ErrorMessage)
}
err = fmt.Errorf(errString)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
@ -404,29 +417,10 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
}
func (s *StepRunSpotInstance) Cleanup(state multistep.StateBag) {
ec2conn := state.Get("ec2").(*ec2.EC2)
ui := state.Get("ui").(packer.Ui)
launchTemplateName := state.Get("launchTemplateName").(string)
// Cancel the spot request if it exists
if s.spotRequest != nil {
ui.Say("Cancelling the spot request...")
input := &ec2.CancelSpotInstanceRequestsInput{
SpotInstanceRequestIds: []*string{s.spotRequest.SpotInstanceRequestId},
}
if _, err := ec2conn.CancelSpotInstanceRequests(input); err != nil {
ui.Error(fmt.Sprintf("Error cancelling the spot request, may still be around: %s", err))
return
}
err := WaitUntilSpotRequestFulfilled(aws.BackgroundContext(), ec2conn, *s.spotRequest.SpotInstanceRequestId)
if err != nil {
ui.Error(err.Error())
}
}
// Terminate the source instance if it exists
if s.instanceId != "" {
ui.Say("Terminating the source AWS instance...")