update service profiles to std::future#537
Merged
hawkw merged 16 commits intomaster-tokio-0.2from May 29, 2020
Merged
Conversation
This was referenced May 28, 2020
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
turns out this is just un-commenting it Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
retries don't actually happen yet Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
olix0r
approved these changes
May 29, 2020
Signed-off-by: Eliza Weisman <[email protected]>
hawkw
added a commit
that referenced
this pull request
May 29, 2020
This PR updates everything remaining in the `linkerd2-proxy-http` crate to use `std::future`. In particular, this includes the following modules: * `add_header` * `insert` * `override_authority` * `header_from_target` The updates for these modules was pretty mechanical and there are no significant changes, just updates to use the new versions of the `Future` and `Service` traits. In addition, I've put back the stack layers from these modules, where possible (in some cases, these modules were used by other code that has yet to be updated or is pending in a separate branch). I've also re-enabled some of the the `discovery` integration tests for the `linkerd2-dst-override` header. Some of these tests depend on service profiles as well, so they will be enabled once #537 merges. Furthermore, I've done a little cleanup now that everything in the crate has been updated. I removed the `grpc` module entirely. Its only purpose was converting between the `tower_grpc::Body` and `hyper::Payload` traits, and `tonic` and the `std::future` version of `hyper` both use the `http_body::Body` trait, so this conversion is unnecessary. Finally, since all the code which depended on the old versions of `tokio` and `futures` has now been updated, I've removed the dependencies on the legacy versions, and renamed the `futures_03` and `tokio_02` renaming imports to just `futures` and `tokio`. Signed-off-by: Eliza Weisman <[email protected]>
hawkw
added a commit
that referenced
this pull request
Jun 1, 2020
This branch updates the proxy's retry implementation to work with `std::future`. Retries in service profiles now work correctly! Again, nothing too out of the ordinary to see here. Depends on #537 Signed-off-by: Eliza Weisman <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This branch updates the service profiles controller client and stack
layers to
std::future, and puts service profiles back in the outboundand 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.rscouldalso 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]