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

store: fix data race when modify event in watchHub. #3972

Merged
merged 1 commit into from
Dec 10, 2015

Conversation

xiang90
Copy link
Contributor

@xiang90 xiang90 commented Dec 9, 2015

The event got from watchHub should be considered as readonly.
To modify it, we first need to get a clone of it or there might
be a data race.

Fix kubernetes/kubernetes#18437

/cc @gyuho @wojtek-t @timothysc

The event got from watchHub should be considered as readonly.
To modify it, we first need to get a clone of it or there might
be a data race.
@wojtek-t
Copy link
Contributor

wojtek-t commented Dec 9, 2015

Great - thanks @xiang90

Would it be possible to patch it to 2.2.2 release once this is merged?

@xiang90
Copy link
Contributor Author

xiang90 commented Dec 9, 2015

@wojtek-t Probably early next week.

@gyuho
Copy link
Contributor

gyuho commented Dec 9, 2015

LGTM.

@wojtek-t
Copy link
Contributor

wojtek-t commented Dec 9, 2015

@wojtek-t Probably early next week.

thanks - can you please ping me then - I will update our dependency on etcd in k8s

@xiang90
Copy link
Contributor Author

xiang90 commented Dec 9, 2015

@wojtek-t sure.

@wojtek-t
Copy link
Contributor

@yichengq @xiang90 - can we have this merged?

xiang90 added a commit that referenced this pull request Dec 10, 2015
store: fix data race when modify event in watchHub.
@xiang90 xiang90 merged commit 833c934 into etcd-io:master Dec 10, 2015
@xiang90 xiang90 deleted the fix_race branch December 10, 2015 15:47
@wojtek-t
Copy link
Contributor

@xiang90 - thanks a lot!

@timothysc
Copy link

@xiang90 could we get this change on a 2-series branch, I'm updating deps right now.

@wojtek-t
Copy link
Contributor

@xiang90 @yichengq - when can we expect this PR patched in 2.2 branch?

@xiang90
Copy link
Contributor Author

xiang90 commented Dec 14, 2015

@wojtek-t I will do the cherry picks today. And release tomorrow hopefully

@wojtek-t
Copy link
Contributor

@xiang90 - thanks a lot!

I guess release is not that urgent, since we have problems in unit tests, and for those we simply have etcd in our Godeps (for which I guess we don't need an official release).

@xiang90
Copy link
Contributor Author

xiang90 commented Dec 14, 2015

@wojtek-t
Copy link
Contributor

@xiang90 - thanks a lot for help!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants