Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
72719214
Commit
72719214
authored
Jan 17, 2017
by
Dr. Stefan Schimanski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong rename pkg/storage.Is{TestFail -> Conflict}
parent
9d2fce7c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
storage.go
pkg/api/errors/storage/storage.go
+2
-2
status.go
pkg/genericapiserver/api/handlers/responsewriters/status.go
+1
-1
errors.go
pkg/storage/errors.go
+2
-2
No files found.
pkg/api/errors/storage/storage.go
View file @
72719214
...
...
@@ -65,7 +65,7 @@ func InterpretCreateError(err error, qualifiedResource schema.GroupResource, nam
// operation into the appropriate API error.
func
InterpretUpdateError
(
err
error
,
qualifiedResource
schema
.
GroupResource
,
name
string
)
error
{
switch
{
case
storage
.
Is
TestFailed
(
err
),
storage
.
IsNodeExist
(
err
),
storage
.
IsInvalidObj
(
err
)
:
case
storage
.
Is
Conflict
(
err
),
storage
.
IsNodeExist
(
err
),
storage
.
IsInvalidObj
(
err
)
:
return
errors
.
NewConflict
(
qualifiedResource
,
name
,
err
)
case
storage
.
IsUnreachable
(
err
)
:
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
)
case
storage
.
IsUnreachable
(
err
)
:
return
errors
.
NewServerTimeout
(
qualifiedResource
,
"delete"
,
2
)
// TODO: make configurable or handled at a higher level
case
storage
.
Is
TestFailed
(
err
),
storage
.
IsNodeExist
(
err
),
storage
.
IsInvalidObj
(
err
)
:
case
storage
.
Is
Conflict
(
err
),
storage
.
IsNodeExist
(
err
),
storage
.
IsInvalidObj
(
err
)
:
return
errors
.
NewConflict
(
qualifiedResource
,
name
,
err
)
case
storage
.
IsInternalError
(
err
)
:
return
errors
.
NewInternalError
(
err
)
...
...
pkg/genericapiserver/api/handlers/responsewriters/status.go
View file @
72719214
...
...
@@ -52,7 +52,7 @@ func apiStatus(err error) *metav1.Status {
status
:=
http
.
StatusInternalServerError
switch
{
//TODO: replace me with NewConflictErr
case
storage
.
Is
TestFailed
(
err
)
:
case
storage
.
Is
Conflict
(
err
)
:
status
=
http
.
StatusConflict
}
// Log errors that were not converted to an error status
...
...
pkg/storage/errors.go
View file @
72719214
...
...
@@ -105,8 +105,8 @@ func IsUnreachable(err error) bool {
return
isErrCode
(
err
,
ErrCodeUnreachable
)
}
// Is
TestFailed
returns true if and only if err is a write conflict.
func
Is
TestFailed
(
err
error
)
bool
{
// Is
Conflict
returns true if and only if err is a write conflict.
func
Is
Conflict
(
err
error
)
bool
{
return
isErrCode
(
err
,
ErrCodeResourceVersionConflicts
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment