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

UPSTREAM: 31627: make deep copy of quota objects before mutations #10704

Merged
merged 1 commit into from
Sep 4, 2016

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Aug 29, 2016

The code currently makes shallow copies which ensures that we aren't accidentally reslicing anything in weird ways, but the usage maps are pointers, so they end up being shared.

This makes a couple copies when we know we're going to mutate to avoid changing shared maps.

I found this while investigating another problem. [test]

@derekwaynecarr origin pick of upstream change

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to e815e5b

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8529/)

@deads2k
Copy link
Contributor Author

deads2k commented Aug 31, 2016

@mfojtik lgtm'ed upstream. We should have this.

@deads2k
Copy link
Contributor Author

deads2k commented Sep 1, 2016

@liggitt looking for a second before merging

@liggitt
Copy link
Contributor

liggitt commented Sep 2, 2016

LGTM

@liggitt liggitt added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 2, 2016
@deads2k
Copy link
Contributor Author

deads2k commented Sep 2, 2016

[merge]

@derekwaynecarr
Copy link
Member

@deads2k @smarterclayton - should this have actually merged?

On Friday, September 2, 2016, OpenShift Bot [email protected]
wrote:

continuous-integration/openshift-jenkins/merge ABORTED (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8670/)


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#10704 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AF8dbJkD7jTY5w3fEF76ZhlxVhBGvayxks5qmLM2gaJpZM4Jvuet
.

@liggitt liggitt added this to the 1.3.0 milestone Sep 4, 2016
@liggitt
Copy link
Contributor

liggitt commented Sep 4, 2016

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to e815e5b

@openshift-bot
Copy link
Contributor

openshift-bot commented Sep 4, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8694/) (Image: devenv-rhel7_4977)

@openshift-bot openshift-bot merged commit e3e0f53 into openshift:master Sep 4, 2016
@deads2k deads2k deleted the cq-bug branch September 6, 2016 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants