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

Adopt external tower-grpc and tower-h2 deps (take II) #225

Merged
merged 4 commits into from
Feb 1, 2018

Conversation

hawkw
Copy link
Member

@hawkw hawkw commented Jan 29, 2018

This is a work in progress and should not be merged before the Conduit 0.2 release.

This PR unvendors all the Rust dependencies except for futures-mpsc-lossy, which doesn't exist elsewhere, and tower-router, for which the vendored version is actually ahead of the version in the tower-rs/tower repository. Unlike PR #215, this branch integrates the transparency work merged in 54aef56, so this obsoletes that pull request.

Once again, we definitely don't want to merge this to master until after the upcoming release, but I'm putting it up for review now so we can get a head start on testing.

Closes #215

@hawkw hawkw self-assigned this Jan 29, 2018
@hawkw hawkw added the review/ready Issue has a reviewable PR label Jan 29, 2018
@hawkw hawkw changed the title Adopt external tower-grpc and tower-h2 deps Adopt external tower-grpc and tower-h2 deps (take II) Jan 29, 2018
@olix0r
Copy link
Member

olix0r commented Jan 30, 2018

Before merging, would you mind squashing this down (and doing DCO signoff) so we can be sure we've CI'd the whole thing as it's actually going to go in?

@hawkw
Copy link
Member Author

hawkw commented Jan 30, 2018

@olix0r sure, can do (AFAIK the only commits missing the DCO sign-off are merge commits generated by GitHub). Do you think it's appropriate to squash this whole branch into a single commit, or should it be squashed into multiple commits?

@olix0r
Copy link
Member

olix0r commented Jan 30, 2018

If there is some narrative that you think is important to preserve, you can squash it into that narrative. Personally, I'd probably squash this into one commit.

@hawkw
Copy link
Member Author

hawkw commented Jan 30, 2018

@olix0r not really, I think one commit seems reasonable. I just wanted to make sure I was doing the right thing before irreversibly munging the git history.

This commit unvendors all of Conduit's Rust crate dependencies except
for  `futures-mpsc-lossy`, which doesn't exist elsewhere, and
`tower-router`, for which the vendored version is actually _ahead_ of
the version in the `tower-rs/tower` repository. Unlike PR #215, this
branch integrates the transparency work merged in
54aef56, so this obsoletes that pull
request.

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
@hawkw
Copy link
Member Author

hawkw commented Jan 31, 2018

@olix0r I've squashed this branch and am going to go ahead and close my PR for #215.

@carllerche
Copy link
Contributor

Looks good to me! I would highly recommend someone else take a look (if they can manage the mega diff).

hawkw and others added 2 commits January 31, 2018 15:00
(I think this is all of it)

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
* README update to 2018 (#233)

Signed-off-by: Andrew Seigner <siggy@buoyant.io>

* Prepare for v0.2.0 release (#248)

* prepare for v0.2.0 release

Signed-off-by: Dennis Adjei-Baah <dennis@buoyant.io>

* Use dots reporter instead of nyan reporter in CI (#238)

Signed-off-by: Risha Mars <mars@buoyant.io>

* Various small UI tweaks (#234)

* Various small UI naming tweaks

- align top two tables in the service mesh page
- "All Deployments" -> "Deployments"
- reorder latency p50, p95, p99
- "Current success" -> "Success rate"

* Add margin to incomplete mesh message, reorder latency in TabbedMetricsTable
* Right align numbers in service mesh page
@hawkw hawkw requested a review from wmorgan as a code owner February 1, 2018 05:15
Signed-off-by: Oliver Gould <ver@buoyant.io>
Copy link
Member

@olix0r olix0r left a comment

Choose a reason for hiding this comment

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

tested locally

@olix0r olix0r merged commit eddc37d into master Feb 1, 2018
@olix0r olix0r deleted the eliza/update-deps branch February 1, 2018 19:57
khappucino pushed a commit to Nordstrom/linkerd2 that referenced this pull request Mar 5, 2019
The conduit repo includes several library projects that have since been
moved into external repos, including `tower-grpc` and `tower-h2`.

This change removes these vendored libraries in favor of using the new
external crates.
olix0r added a commit that referenced this pull request Apr 26, 2019
commit 61db2e77a247f7b0235b67581f60e8a92f8543cb
Author: Sean McArthur <sean@seanmonstar.com>
Date:   Tue Apr 23 17:20:43 2019 -0700

    Replace linkerd2-stack with tower-layer (#236)

    Signed-off-by: Sean McArthur <sean@buoyant.io>

commit 2d6c7145cadf709832f3507bcefdaee509ebde81
Author: Sean McArthur <sean@seanmonstar.com>
Date:   Thu Apr 18 12:40:48 2019 -0700

    Add load shedding when over max-in-flight requests. (#225)

    Also adds configuration for inbound and outbound max-in-flight requests.

    Signed-off-by: Sean McArthur <sean@buoyant.io>

commit f4b5cd0b4a25d7d942e018b42af1157ae2e7dbb0
Author: Oliver Gould <ver@buoyant.io>
Date:   Wed Apr 17 13:53:49 2019 -0700

    Upgrade tower (#232)

    This avails the proxy of newer load balancer features, an updated buffer
    implementation, etc.

    The new buffer implementation requires that we implement TypedExecutor
    for our logging executor; and more error types have been made dynamic.
alpeb pushed a commit that referenced this pull request Apr 26, 2019
commit 61db2e77a247f7b0235b67581f60e8a92f8543cb
Author: Sean McArthur <sean@seanmonstar.com>
Date:   Tue Apr 23 17:20:43 2019 -0700

    Replace linkerd2-stack with tower-layer (#236)

    Signed-off-by: Sean McArthur <sean@buoyant.io>

commit 2d6c7145cadf709832f3507bcefdaee509ebde81
Author: Sean McArthur <sean@seanmonstar.com>
Date:   Thu Apr 18 12:40:48 2019 -0700

    Add load shedding when over max-in-flight requests. (#225)

    Also adds configuration for inbound and outbound max-in-flight requests.

    Signed-off-by: Sean McArthur <sean@buoyant.io>

commit f4b5cd0b4a25d7d942e018b42af1157ae2e7dbb0
Author: Oliver Gould <ver@buoyant.io>
Date:   Wed Apr 17 13:53:49 2019 -0700

    Upgrade tower (#232)

    This avails the proxy of newer load balancer features, an updated buffer
    implementation, etc.

    The new buffer implementation requires that we implement TypedExecutor
    for our logging executor; and more error types have been made dynamic.
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/proxy review/ready Issue has a reviewable PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants