Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(docker_logs source): Update hyper to work around the docker EOF errors#5561

Merged
eeyun merged 1 commit intomasterfrom
docker-eof-fix
Dec 17, 2020
Merged

fix(docker_logs source): Update hyper to work around the docker EOF errors#5561
eeyun merged 1 commit intomasterfrom
docker-eof-fix

Conversation

@MOZGIII
Copy link
Contributor

@MOZGIII MOZGIII commented Dec 16, 2020

This PR fixes (or rather is supposed to be fixing) the issue with docker that was reported earlier today.

Once merged, we'd want to backport it to 0.11 and ship with 0.11.1.

This is a hotfix, a proper resolution will be to simply bump the hyper once they cut a release.

@MOZGIII MOZGIII requested review from eeyun and jamtur01 December 16, 2020 16:28
Copy link
Contributor

@eeyun eeyun left a comment

Choose a reason for hiding this comment

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

Copy link
Contributor

@jamtur01 jamtur01 left a comment

Choose a reason for hiding this comment

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

LGTM.

@jamtur01
Copy link
Contributor

@binarylogic As discussed.

[patch.'https://github.com/tower-rs/tower']
tower-layer = "0.3"

[patch.crates-io]
Copy link
Contributor

Choose a reason for hiding this comment

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

We should add a comment here explaining what we need to bump hyper at some point.

Copy link
Contributor

Choose a reason for hiding this comment

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

Indeed - I'd also like to wait to merge this until we verify that it's the solution. I think based on our morning detective work it is but if its at all possible to avoid merging an unnecessary crate patch that would be my preference.

Copy link
Contributor Author

@MOZGIII MOZGIII Dec 17, 2020

Choose a reason for hiding this comment

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

We can merge the patch and then switch to the released version. If we merge it the solution will be in the nightly and it'll be easier to test. We'll have to bump to publushed version either way, but we're imo in a good position to work with such patches.

I'll add a comment, and will merge if you agree.
We can already move from a fork to the upstream git since my PR (hyperium/hyper#2363) was accepted.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sounds good to me!

@eeyun eeyun merged commit 9052239 into master Dec 17, 2020
@eeyun eeyun deleted the docker-eof-fix branch December 17, 2020 15:46
binarylogic pushed a commit that referenced this pull request Dec 17, 2020
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