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

rename retry so it doesn't stutter

Browse Source
This commit is contained in:
Megan Marsh 2020-11-16 11:49:33 -08:00
parent f52a2ad0fa
commit 94a660147e
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/osc/common/retry/retry.go
View File

@ -15,7 +15,7 @@ var RetryExhaustedError error = fmt.Errorf("Function never succeeded in Retry")
type RetryableFunc func(uint) (bool, error) type RetryableFunc func(uint) (bool, error)
/* /*
Retry retries a function up to numTries times with exponential backoff. Run retries a function up to numTries times with exponential backoff.
If numTries == 0, retry indefinitely. If numTries == 0, retry indefinitely.
If interval == 0, Retry will not delay retrying and there will be no If interval == 0, Retry will not delay retrying and there will be no
exponential backoff. exponential backoff.
@ -24,7 +24,7 @@ Intervals are in seconds.
Returns an error if initial > max intervals, if retries are exhausted, or if the passed function returns Returns an error if initial > max intervals, if retries are exhausted, or if the passed function returns
an error. an error.
*/ */
func Retry(initialInterval float64, maxInterval float64, numTries uint, function RetryableFunc) error { func Run(initialInterval float64, maxInterval float64, numTries uint, function RetryableFunc) error {
if maxInterval == 0 { if maxInterval == 0 {
maxInterval = math.Inf(1) maxInterval = math.Inf(1)
} else if initialInterval < 0 || initialInterval > maxInterval { } else if initialInterval < 0 || initialInterval > maxInterval {

8
builder/osc/common/retry/retry_test.go
View File

@ -8,7 +8,7 @@ import (
func TestRetry(t *testing.T) { func TestRetry(t *testing.T) {
numTries := uint(0) numTries := uint(0)
// Test that a passing function only gets called once. // Test that a passing function only gets called once.
err := Retry(0, 0, 0, func(i uint) (bool, error) { err := Run(0, 0, 0, func(i uint) (bool, error) {
numTries++ numTries++
return true, nil return true, nil
}) })
@ -22,7 +22,7 @@ func TestRetry(t *testing.T) {
// Test that a failing function gets retried (once in this example). // Test that a failing function gets retried (once in this example).
numTries = 0 numTries = 0
results := []bool{false, true} results := []bool{false, true}
err = Retry(0, 0, 0, func(i uint) (bool, error) { err = Run(0, 0, 0, func(i uint) (bool, error) {
result := results[numTries] result := results[numTries]
numTries++ numTries++
return result, nil return result, nil
@ -37,7 +37,7 @@ func TestRetry(t *testing.T) {
// Test that a function error gets returned, and the function does not get called again. // Test that a function error gets returned, and the function does not get called again.
numTries = 0 numTries = 0
funcErr := fmt.Errorf("This function had an error!") funcErr := fmt.Errorf("This function had an error!")
err = Retry(0, 0, 0, func(i uint) (bool, error) { err = Run(0, 0, 0, func(i uint) (bool, error) {
numTries++ numTries++
return false, funcErr return false, funcErr
}) })
@ -51,7 +51,7 @@ func TestRetry(t *testing.T) {
// Test when a function exhausts its retries. // Test when a function exhausts its retries.
numTries = 0 numTries = 0
expectedTries := uint(3) expectedTries := uint(3)
err = Retry(0, 0, expectedTries, func(i uint) (bool, error) { err = Run(0, 0, expectedTries, func(i uint) (bool, error) {
numTries++ numTries++
return false, nil return false, nil
}) })

2
builder/osc/common/state.go
View File

@ -68,7 +68,7 @@ func WaitUntilOscSnapshotDone(conn *osc.APIClient, snapshotID string) error {
} }
func waitForState(errCh chan<- error, target string, refresh stateRefreshFunc) { func waitForState(errCh chan<- error, target string, refresh stateRefreshFunc) {
err := retry.Retry(2, 2, 0, func(_ uint) (bool, error) { err := retry.Run(2, 2, 0, func(_ uint) (bool, error) {
state, err := refresh() state, err := refresh()
if err != nil { if err != nil {
return false, err return false, err

2
builder/osc/common/step_create_tags.go
View File

@ -90,7 +90,7 @@ func (s *StepCreateTags) Run(_ context.Context, state multistep.StateBag) multis
snapshotTags.Report(ui) snapshotTags.Report(ui)
// Retry creating tags for about 2.5 minutes // Retry creating tags for about 2.5 minutes
err = retry.Retry(0.2, 30, 11, func(_ uint) (bool, error) { err = retry.Run(0.2, 30, 11, func(_ uint) (bool, error) {
// Tag images and snapshots // Tag images and snapshots
_, _, err := regionconn.TagApi.CreateTags(context.Background(), &osc.CreateTagsOpts{ _, _, err := regionconn.TagApi.CreateTags(context.Background(), &osc.CreateTagsOpts{
CreateTagsRequest: optional.NewInterface(osc.CreateTagsRequest{ CreateTagsRequest: optional.NewInterface(osc.CreateTagsRequest{

2
builder/osc/common/step_run_source_vm.go
View File

@ -234,7 +234,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
if s.IsRestricted { if s.IsRestricted {
oscTags.Report(ui) oscTags.Report(ui)
// Retry creating tags for about 2.5 minutes // Retry creating tags for about 2.5 minutes
err = retry.Retry(0.2, 30, 11, func(_ uint) (bool, error) { err = retry.Run(0.2, 30, 11, func(_ uint) (bool, error) {
_, _, err := oscconn.TagApi.CreateTags(context.Background(), &osc.CreateTagsOpts{ _, _, err := oscconn.TagApi.CreateTags(context.Background(), &osc.CreateTagsOpts{
CreateTagsRequest: optional.NewInterface(osc.CreateTagsRequest{ CreateTagsRequest: optional.NewInterface(osc.CreateTagsRequest{
Tags: oscTags, Tags: oscTags,

2
builder/osc/common/step_stop_bsu_backed_vm.go
View File

@ -41,7 +41,7 @@ func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag)
// does not exist. // does not exist.
// Work around this by retrying a few times, up to about 5 minutes. // Work around this by retrying a few times, up to about 5 minutes.
err := retry.Retry(10, 60, 6, func(i uint) (bool, error) { err := retry.Run(10, 60, 6, func(i uint) (bool, error) {
ui.Message(fmt.Sprintf("Stopping vm, attempt %d", i+1)) ui.Message(fmt.Sprintf("Stopping vm, attempt %d", i+1))
_, _, err = oscconn.VmApi.StopVms(context.Background(), &osc.StopVmsOpts{ _, _, err = oscconn.VmApi.StopVms(context.Background(), &osc.StopVmsOpts{