Skip to content

update protocol upgrades to std::future#528

Merged
hawkw merged 6 commits intomaster-tokio-0.2from
eliza/0.2-upgrades
May 27, 2020
Merged

update protocol upgrades to std::future#528
hawkw merged 6 commits intomaster-tokio-0.2from
eliza/0.2-upgrades

Conversation

@hawkw
Copy link
Contributor

@hawkw hawkw commented May 22, 2020

This branch updates the l5d-orig-proto upgrade/downgrade code to use
std::future, and puts it back in the stack.

It turns out that the integration tests that exercise this don't
actually assert that an upgrade is performed when the hint is sent,
just that sending the hint doesn't break proxy-to-proxy traffic (which
is a bummer, but it's hard to assert that in an integration test). So,
those tests were passing before this branch.

However, I validated that the upgrade is performed by checking the logs:

[     0.73767491s] DEBUG proxy{test=main:proxy}:outbound:accept{peer.addr=127.0.0.1:60420}:source{target.addr=127.0.0.1:34913}:logical{addr=transparency.test.svc.cluster.local:80}:balance{addr=transparency.test.svc.cluster.local:80}:endpoint{peer.addr=127.0.0.1:34885}: linkerd2_proxy_transport::connect: Connected local.addr=127.0.0.1:50732 keepalive=None
[     0.73871743s] DEBUG proxy{test=main:proxy}:outbound:accept{peer.addr=127.0.0.1:60420}:source{target.addr=127.0.0.1:34913}:logical{addr=transparency.test.svc.cluster.local:80}:balance{addr=transparency.test.svc.cluster.local:80}:endpoint{peer.addr=127.0.0.1:34885}: linkerd2_proxy_transport::metrics: client connection open
[     0.74886384s] DEBUG proxy{test=main:proxy}:outbound:accept{peer.addr=127.0.0.1:60420}:source{target.addr=127.0.0.1:34913}:logical{addr=transparency.test.svc.cluster.local:80}:balance{addr=transparency.test.svc.cluster.local:80}: linkerd2_timeout::failfast: Recovered
[     0.75516939s] DEBUG proxy{test=main:proxy}:outbound:accept{peer.addr=127.0.0.1:60420}:source{target.addr=127.0.0.1:34913}:logical{addr=transparency.test.svc.cluster.local:80}:balance{addr=transparency.test.svc.cluster.local:80}:endpoint{peer.addr=127.0.0.1:34885}: linkerd2_proxy_http::orig_proto: Upgrading request to HTTP2 from HTTP/1.1
[     0.75671201s] DEBUG proxy{test=main:proxy}:outbound:accept{peer.addr=127.0.0.1:60420}:source{target.addr=127.0.0.1:34913}:logical{addr=transparency.test.svc.cluster.local:80}:balance{addr=transparency.test.svc.cluster.local:80}:endpoint{peer.addr=127.0.0.1:34885}: linkerd2_proxy_http::client: method=POST uri=/ version=HTTP/2.0 headers={"l5d-orig-proto": "HTTP/1.1", "host": "transparency.test.svc.cluster.local"}
[     0.77214679s] DEBUG proxy{test=main:proxy}:outbound:accept{peer.addr=127.0.0.1:60420}:source{target.addr=127.0.0.1:34913}:logical{addr=transparency.test.svc.cluster.local:80}:balance{addr=transparency.test.svc.cluster.local:80}: linkerd2_timeout::failfast: Recovered
[     0.143665402s] DEBUG proxy{test=main:proxy}:inbound:accept{peer.addr=127.0.0.1:50732}:source{target.addr=127.0.0.1:39975}:linkerd2_proxy_http::orig_proto: translating HTTP2 to orig-proto: "HTTP/1.1"

Depends on #526

@hawkw hawkw requested a review from a team May 22, 2020 22:59
@hawkw hawkw requested a review from a team May 23, 2020 17:20
@hawkw hawkw changed the base branch from eliza/0.2-outbound to master-tokio-0.2 May 26, 2020 19:42
hawkw added 3 commits May 26, 2020 12:42
@hawkw
update http::orig_proto
a620838 
Signed-off-by: Eliza Weisman <[email protected]>
@hawkw
put back outbound orig_proto
a85211c 
Signed-off-by: Eliza Weisman <[email protected]>
@hawkw
put back inbound orig_proto downgrade
2820c55 
Signed-off-by: Eliza Weisman <[email protected]>
@hawkw hawkw force-pushed the eliza/0.2-upgrades branch from d3f3120 to 2820c55 Compare May 26, 2020 19:43
hawkw added 3 commits May 26, 2020 12:54
@hawkw
rustfmt
7144321 
Signed-off-by: Eliza Weisman <[email protected]>
@hawkw
Revert "rustfmt"
a879279 
This reverts commit 7144321.

Accidentally included changes from another branch.
@hawkw
actual rustfmt
c2cd7f1 
Signed-off-by: Eliza Weisman <[email protected]>
@hawkw hawkw self-assigned this May 27, 2020
kleimkuhler
kleimkuhler approved these changes May 27, 2020
View reviewed changes
Copy link
Contributor

@kleimkuhler kleimkuhler left a comment

Choose a reason for hiding this comment

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

👍

@hawkw hawkw merged commit 9de8c86 into master-tokio-0.2 May 27, 2020
@hawkw hawkw deleted the eliza/0.2-upgrades branch May 27, 2020 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@olix0r olix0r olix0r approved these changes

+1 more reviewer

@kleimkuhler kleimkuhler kleimkuhler approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@hawkw hawkw

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hawkw @olix0r @kleimkuhler