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: 66464: Avoid overflowing int64 in RoundUpSize and return error if overflow int #20418

Merged
merged 4 commits into from
Jul 29, 2018

Conversation

wongma7
Copy link
Contributor

@wongma7 wongma7 commented Jul 25, 2018

This fixes/mitigates https://bugzilla.redhat.com/show_bug.cgi?id=1592653

commits 1 & 2 are needed for patching GCE files cleanly. They fix a bug with GCE GiB vs GB and they were cherrypicked into kubernetes 1.11 (and 1.10) as well so there is no harm in doing the same here.

commit 3 is for patching cinder files cleanly. it is arguable whether it's needed or I should have just manually fixed the conflict but It seems harmless to me.

commit 4 is the patch I actually want to cherry-pick

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 25, 2018
@wongma7
Copy link
Contributor Author

wongma7 commented Jul 25, 2018

@openshift/sig-storage please review thank you!

@jsafrane
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 26, 2018
@wongma7
Copy link
Contributor Author

wongma7 commented Jul 26, 2018

/assign @smarterclayton
please approve, thank you

@wongma7
Copy link
Contributor Author

wongma7 commented Jul 26, 2018

/retest

@jsafrane
Copy link
Contributor

/assign @mfojtik
for approval, thanks

@mfojtik
Copy link
Contributor

mfojtik commented Jul 27, 2018

/approve no-issue

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, mfojtik, wongma7

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 27, 2018
@wongma7
Copy link
Contributor Author

wongma7 commented Jul 27, 2018

/test end_to_end

{"component":"initupload","error":"failed to upload to GCS: could not connect to GCS: dialing: cannot read credentials file: open /data/credentials.json: no such file or directory","level":"fatal","msg":"Failed to initialize job","time":"2018-07-27T16:47:58Z"}

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@0xmichalis
Copy link
Contributor

/refresh

@openshift-merge-robot openshift-merge-robot merged commit e643d7b into openshift:master Jul 29, 2018
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. lgtm Indicates that a PR is ready to be merged. sig/storage size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants