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
0bfbd40d
Commit
0bfbd40d
authored
Mar 09, 2017
by
timchenxiaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some typo
parent
5af81b09
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
helpers.go
pkg/kubelet/dockershim/helpers.go
+2
-2
No files found.
pkg/kubelet/dockershim/helpers.go
View file @
0bfbd40d
...
@@ -271,7 +271,7 @@ func getUserFromImageUser(imageUser string) (*int64, string) {
...
@@ -271,7 +271,7 @@ func getUserFromImageUser(imageUser string) (*int64, string) {
}
}
// See #33189. If the previous attempt to create a sandbox container name FOO
// See #33189. If the previous attempt to create a sandbox container name FOO
// failed due to "device or resource busy", it is poss
bi
le that docker did
// failed due to "device or resource busy", it is poss
ib
le that docker did
// not clean up properly and has inconsistent internal state. Docker would
// not clean up properly and has inconsistent internal state. Docker would
// not report the existence of FOO, but would complain if user wants to
// not report the existence of FOO, but would complain if user wants to
// create a new container named FOO. To work around this, we parse the error
// create a new container named FOO. To work around this, we parse the error
...
@@ -280,7 +280,7 @@ func getUserFromImageUser(imageUser string) (*int64, string) {
...
@@ -280,7 +280,7 @@ func getUserFromImageUser(imageUser string) (*int64, string) {
// See #40443. Sometimes even removal may fail with "no such container" error.
// See #40443. Sometimes even removal may fail with "no such container" error.
// In that case we have to create the container with a randomized name.
// In that case we have to create the container with a randomized name.
// TODO(random-liu): Remove this work around after docker 1.11 is deprecated.
// TODO(random-liu): Remove this work around after docker 1.11 is deprecated.
// TODO(#33189): Monitor the tests to see if the fix is sufficent.
// TODO(#33189): Monitor the tests to see if the fix is suffic
i
ent.
func
recoverFromCreationConflictIfNeeded
(
client
dockertools
.
DockerInterface
,
createConfig
dockertypes
.
ContainerCreateConfig
,
err
error
)
(
*
dockertypes
.
ContainerCreateResponse
,
error
)
{
func
recoverFromCreationConflictIfNeeded
(
client
dockertools
.
DockerInterface
,
createConfig
dockertypes
.
ContainerCreateConfig
,
err
error
)
(
*
dockertypes
.
ContainerCreateResponse
,
error
)
{
matches
:=
conflictRE
.
FindStringSubmatch
(
err
.
Error
())
matches
:=
conflictRE
.
FindStringSubmatch
(
err
.
Error
())
if
len
(
matches
)
!=
2
{
if
len
(
matches
)
!=
2
{
...
...
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