Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix race in serializing sandbox to string #1495

Merged
merged 1 commit into from
Oct 13, 2016
Merged

fix race in serializing sandbox to string #1495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,8 +868,9 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
if s.containerID == containerID {
// If not a stub, then we already have a complete sandbox.
if !s.isStub {
sbID := s.ID()
c.Unlock()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given this is a very unlikely error and given sandbox does not implement the String() method, there is no much value in printing the whole raw structure. I am thinking we can avoid the issue and just change the error format to
(container %s is already present in sandbox %s", containerID, s.ID())

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ok with changing format, but s.ID() is still not goroutine-safe, so I would need to do it under lock.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks did not notice s.ID() is not goroutine-safe, feel free to change it, I think iit is a safe change. Or stick with your last suggestion. Up to you.

return nil, types.ForbiddenErrorf("container %s is already present: %v", containerID, s)
return nil, types.ForbiddenErrorf("container %s is already present in sandbox %s", containerID, sbID)
}

// We already have a stub sandbox from the
Expand Down