Skip to content

update linkerd2-error-respond to std::future#536

Merged
hawkw merged 3 commits intomaster-tokio-0.2from
eliza/0.2-errors
May 27, 2020
Merged

update linkerd2-error-respond to std::future#536
hawkw merged 3 commits intomaster-tokio-0.2from
eliza/0.2-errors

Conversation

@hawkw
Copy link
Contributor

@hawkw hawkw commented May 27, 2020

This branch updates the linkerd2-error-respond middleware to std::future,
and puts back the error response layers in the inbound and outbound stacks.

This is pretty straightforward and shouldn't take a whole lot of time to review.

Signed-off-by: Eliza Weisman [email protected]

@hawkw hawkw requested review from a team and olix0r May 27, 2020 18:42
@hawkw hawkw requested a review from a team May 27, 2020 20:43
@hawkw hawkw self-assigned this May 27, 2020
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 a5c8ec9 into master-tokio-0.2 May 27, 2020
@hawkw hawkw removed the request for review from a team May 27, 2020 22:05
@hawkw hawkw deleted the eliza/0.2-errors branch May 27, 2020 22:07
hawkw added a commit that referenced this pull request May 29, 2020
This branch updates the service profiles controller client and stack
layers to `std::future`, and puts service profiles back in the outbound
and inbound stacks. Retries do not actually happen yet because the retry
code hasn't been updated. 

All of the tests for profile destination overrides can now be
re-enabled. In addition, some of the the tests in `profiles.rs` could
also be re-enabled, with the exception of the ones that actually expect
retries to happen.

Depends on #536.

Signed-off-by: Eliza Weisman <[email protected]>
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