Vendor in common 0.33.1

As per title

Signed-off-by: Ashley Cui <acui@redhat.com>
This commit is contained in:
Ashley Cui
2021-01-13 13:00:33 -05:00
parent 9473dda87c
commit 566a923950
8 changed files with 11 additions and 11 deletions

View File

@ -318,7 +318,7 @@ type EngineConfig struct {
// RuntimeSupportsNoCgroups is a list of OCI runtimes that support
// running containers without CGroups.
RuntimeSupportsNoCgroups []string `toml:"runtime_supports_nocgroupv2,omitempty"`
RuntimeSupportsNoCgroups []string `toml:"runtime_supports_nocgroup,omitempty"`
// RuntimeSupportsKVM is a list of OCI runtimes that support
// KVM separation for containers.

View File

@ -69,7 +69,7 @@ func isRetryable(err error) bool {
}
return isRetryable(e.Err)
case syscall.Errno:
return shouldRestart(e)
return isErrnoRetryable(e)
case errcode.Errors:
// if this error is a group of errors, process them all in turn
for i := range e {
@ -94,10 +94,10 @@ func isRetryable(err error) bool {
return false
}
func shouldRestart(e error) bool {
func isErrnoRetryable(e error) bool {
switch e {
case syscall.ECONNREFUSED, syscall.EINTR, syscall.EAGAIN, syscall.EBUSY, syscall.ENETDOWN, syscall.ENETUNREACH, syscall.ENETRESET, syscall.ECONNABORTED, syscall.ECONNRESET, syscall.ETIMEDOUT, syscall.EHOSTDOWN, syscall.EHOSTUNREACH:
return true
}
return shouldRestartPlatform(e)
return isErrnoERESTART(e)
}

View File

@ -4,6 +4,6 @@ import (
"syscall"
)
func shouldRestartPlatform(e error) bool {
func isErrnoERESTART(e error) bool {
return e == syscall.ERESTART
}

View File

@ -2,6 +2,6 @@
package retry
func shouldRestartPlatform(e error) bool {
func isErrnoERESTART(e error) bool {
return false
}

View File

@ -1,4 +1,4 @@
package version
// Version is the version of the build.
const Version = "0.33.0"
const Version = "0.33.1"