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

port stack to std::future #487

Merged
merged 6 commits into from
Apr 23, 2020
Merged

port stack to std::future #487

merged 6 commits into from
Apr 23, 2020

Conversation

hawkw
Copy link
Contributor

@hawkw hawkw commented Apr 21, 2020

This branch ports the linkerd2-stack crate to use Tower 0.3 and
std::future and tokio 0.2's timers. I've also re-enabled the
push_* methods for layers exported by that crate.

This change should be pretty straightforward to read, as it's fairly
mechanical in nature. I've basically just changed the code to account
for the new APIs, but the implementation should be quite similar.

@hawkw hawkw requested review from olix0r and kleimkuhler April 21, 2020 23:53
@hawkw hawkw self-assigned this Apr 21, 2020
hawkw added 6 commits April 22, 2020 10:59
Signed-off-by: Eliza Weisman <eliza@buoyant.io>
Signed-off-by: Eliza Weisman <eliza@buoyant.io>
This one was slightly tricker because `tower-util::Ready` now borrows.

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
Signed-off-by: Eliza Weisman <eliza@buoyant.io>
Signed-off-by: Eliza Weisman <eliza@buoyant.io>
Signed-off-by: Eliza Weisman <eliza@buoyant.io>
@hawkw hawkw force-pushed the eliza/0.2-stack branch from 55d2012 to 8228f83 Compare April 22, 2020 18:00
@hawkw hawkw changed the base branch from eliza/0.2-serve to master-tokio-0.2 April 22, 2020 18:00
@hawkw hawkw requested a review from a team April 22, 2020 18:00
@hawkw hawkw mentioned this pull request Apr 22, 2020
@hawkw hawkw requested a review from kleimkuhler April 23, 2020 02:36
@hawkw hawkw merged commit 00a5707 into master-tokio-0.2 Apr 23, 2020
hawkw added a commit that referenced this pull request Apr 24, 2020
This branch ports the `linkerd2-buffer` to use `std::future` and `tokio`
0.2. I've also re-enabled the `push_spawn_buffer` fns in `svc`.

Like #486 and #487, this change should be pretty straightforward to
read, as it's fairly mechanical in nature. I've basically just changed
the code to account for the new APIs. This one might be a _little_ more
interesting, since it shows off some of the API differences in
`tokio::sync` in 0.2 as well.

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
@olix0r olix0r deleted the eliza/0.2-stack branch May 25, 2021 15:46
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