github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40018 from sttts/sttts-genericapiserver-storage-dep

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40008, 40005, 40018)

Fix wrong rename pkg/storage.Is{TestFail -> Conflict}
This commit is contained in:
Kubernetes Submit Queue 2017-01-18 04:04:49 -08:00 committed by GitHub
commit fe69dcf861
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/errors/storage/storage.go
View File

@ -65,7 +65,7 @@ func InterpretCreateError(err error, qualifiedResource schema.GroupResource, nam
// operation into the appropriate API error. // operation into the appropriate API error.
func InterpretUpdateError(err error, qualifiedResource schema.GroupResource, name string) error { func InterpretUpdateError(err error, qualifiedResource schema.GroupResource, name string) error {
switch { switch {
case storage.IsTestFailed(err), storage.IsNodeExist(err), storage.IsInvalidObj(err): case storage.IsConflict(err), storage.IsNodeExist(err), storage.IsInvalidObj(err):
return errors.NewConflict(qualifiedResource, name, err) return errors.NewConflict(qualifiedResource, name, err)
case storage.IsUnreachable(err): case storage.IsUnreachable(err):
return errors.NewServerTimeout(qualifiedResource, "update", 2) // TODO: make configurable or handled at a higher level return errors.NewServerTimeout(qualifiedResource, "update", 2) // TODO: make configurable or handled at a higher level
@ -86,7 +86,7 @@ func InterpretDeleteError(err error, qualifiedResource schema.GroupResource, nam
return errors.NewNotFound(qualifiedResource, name) return errors.NewNotFound(qualifiedResource, name)
case storage.IsUnreachable(err): case storage.IsUnreachable(err):
return errors.NewServerTimeout(qualifiedResource, "delete", 2) // TODO: make configurable or handled at a higher level return errors.NewServerTimeout(qualifiedResource, "delete", 2) // TODO: make configurable or handled at a higher level
case storage.IsTestFailed(err), storage.IsNodeExist(err), storage.IsInvalidObj(err): case storage.IsConflict(err), storage.IsNodeExist(err), storage.IsInvalidObj(err):
return errors.NewConflict(qualifiedResource, name, err) return errors.NewConflict(qualifiedResource, name, err)
case storage.IsInternalError(err): case storage.IsInternalError(err):
return errors.NewInternalError(err) return errors.NewInternalError(err)

2
pkg/genericapiserver/api/handlers/responsewriters/status.go
View File

@ -52,7 +52,7 @@ func apiStatus(err error) *metav1.Status {
status := http.StatusInternalServerError status := http.StatusInternalServerError
switch { switch {
//TODO: replace me with NewConflictErr //TODO: replace me with NewConflictErr
case storage.IsTestFailed(err): case storage.IsConflict(err):
status = http.StatusConflict status = http.StatusConflict
} }
// Log errors that were not converted to an error status // Log errors that were not converted to an error status

4
pkg/storage/errors.go
View File

@ -105,8 +105,8 @@ func IsUnreachable(err error) bool {
return isErrCode(err, ErrCodeUnreachable) return isErrCode(err, ErrCodeUnreachable)
} }
// IsTestFailed returns true if and only if err is a write conflict. // IsConflict returns true if and only if err is a write conflict.
func IsTestFailed(err error) bool { func IsConflict(err error) bool {
return isErrCode(err, ErrCodeResourceVersionConflicts) return isErrCode(err, ErrCodeResourceVersionConflicts)
} }