-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Surface the underlying error on wait timeout. (#4966)
Signed-off-by: Alex Collins <alex_collins@intuit.com>
- Loading branch information
Showing
14 changed files
with
111 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
package wait | ||
|
||
import ( | ||
"fmt" | ||
|
||
"k8s.io/apimachinery/pkg/util/wait" | ||
) | ||
|
||
// the underlying ExponentialBackoff does not retain the underlying error | ||
// so this addresses this | ||
func Backoff(b wait.Backoff, f func() (bool, error)) error { | ||
var err error | ||
waitErr := wait.ExponentialBackoff(b, func() (bool, error) { | ||
var done bool | ||
done, err = f() | ||
return done, nil | ||
}) | ||
if waitErr != nil { | ||
if err != nil { | ||
return fmt.Errorf("%v: %v", waitErr, err) | ||
} else { | ||
return waitErr | ||
} | ||
} | ||
return err | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package wait | ||
|
||
import ( | ||
"errors" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"k8s.io/apimachinery/pkg/util/wait" | ||
) | ||
|
||
func TestExponentialBackoff2(t *testing.T) { | ||
t.Run("NoError", func(t *testing.T) { | ||
err := Backoff(wait.Backoff{Steps: 1}, func() (bool, error) { | ||
return true, nil | ||
}) | ||
assert.NoError(t, err) | ||
}) | ||
t.Run("Error", func(t *testing.T) { | ||
err := Backoff(wait.Backoff{Steps: 1}, func() (bool, error) { | ||
return true, errors.New("foo") | ||
}) | ||
assert.EqualError(t, err, "foo") | ||
}) | ||
t.Run("Timeout", func(t *testing.T) { | ||
err := Backoff(wait.Backoff{Steps: 1}, func() (bool, error) { | ||
return false, nil | ||
}) | ||
assert.Equal(t, err, wait.ErrWaitTimeout) | ||
}) | ||
t.Run("TimeoutError", func(t *testing.T) { | ||
err := Backoff(wait.Backoff{Steps: 1}, func() (bool, error) { | ||
return false, errors.New("foo") | ||
}) | ||
assert.EqualError(t, err, "timed out waiting for the condition: foo") | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.