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.

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

Fix data race in kubelet fake_docker_client #587

Merged
merged 1 commit into from
Jul 23, 2014

Conversation

VojtechVitek
Copy link
Contributor

No description provided.

// This is not a very good fake. We'll just add this container's name to the list.
// Docker likes to add a '/', so copy that behavior.
name := "/" + c.Name
f.lock.Lock()
Copy link
Contributor

Choose a reason for hiding this comment

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

Move to top of function

@lavalamp
Copy link
Member

minor comments, LGTM otherwise.

@VojtechVitek
Copy link
Contributor Author

Rebased. Could you please review once again?

@lavalamp
Copy link
Member

LGTM once you add back the clearCalls() method to fix travis :)

- Fix reslice in Pull() to remove the just returned error
- Fix data races found during the integration testing
- Remove one-liner helper method for better readability
@VojtechVitek
Copy link
Contributor Author

:) fixed

@smarterclayton
Copy link
Contributor

LGTM

lavalamp added a commit that referenced this pull request Jul 23, 2014
Fix data race in kubelet fake_docker_client
@lavalamp lavalamp merged commit e2e2ce4 into kubernetes:master Jul 23, 2014
@lavalamp
Copy link
Member

Thanks for the change!

@VojtechVitek VojtechVitek deleted the data_race branch July 23, 2014 21:00
vishh added a commit to vishh/kubernetes that referenced this pull request Apr 6, 2016
Add alias and namespace information to /spec endpoint
bertinatto pushed a commit to bertinatto/kubernetes that referenced this pull request Feb 24, 2021
UPSTREAM: 99199: delay serving CRD creates for a few seconds for HA consistency
linxiulei pushed a commit to linxiulei/kubernetes that referenced this pull request Jan 18, 2024
Add a check if the metric is nil so that collector doesn't collect metrics.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants