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.

Sign up for GitHub

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

Jump to bottom

Pass router::Config directly to router::Layer #253

Merged
merged 5 commits into from
May 14, 2019
Merged

Pass router::Config directly to router::Layer #253

merged 5 commits into from
May 14, 2019

Conversation

hawkw
Copy link
Member

@hawkw hawkw commented May 14, 2019

Currently, router layers are constructed with a single argument, a
type implementing Recognize. Then, the entire router stack is built
with a router::Config. However, in #248, it became necessary to
provide the config up front when constructing the router::layer, as
the layer is used in a fallback layer. Rather than providing a separate
type for a preconfigured layer, @olix0r suggested we simply change all
router layers to accept the Config when they're constructed (see
#248 (comment)).

This branch changes router::Layer to accept the config up front. The
router::Stack types make function now requires no arguments, and the
implementation of Service for Stack can be called with any T (as
the target is now ignored).

Signed-off-by: Eliza Weisman eliza@buoyant.io

hawkw added 5 commits May 14, 2019 12:55
@hawkw
Pass router::Config directly to router::Layer
4f0f7c8 
Signed-off-by: Eliza Weisman <eliza@buoyant.io>
@hawkw
Cut out the middlewareman
cc77f41 
Signed-off-by: Eliza Weisman <eliza@buoyant.io>
@hawkw
rm dead code
fc63002 
Signed-off-by: Eliza Weisman <eliza@buoyant.io>
@hawkw
Revert "Cut out the middlewareman"
472d032 
This reverts commit cc77f41.
@hawkw
Revert "rm dead code"
076e438 
This reverts commit fc63002.
@hawkw hawkw requested review from seanmonstar and olix0r May 14, 2019 21:12
@hawkw hawkw self-assigned this May 14, 2019
@hawkw hawkw mentioned this pull request May 14, 2019
Merged
@hawkw hawkw merged commit 16441c2 into master May 14, 2019
@hawkw hawkw deleted the liza/router-i-hardly-knew-er branch May 14, 2019 21:40
sprt pushed a commit to sprt/linkerd2-proxy that referenced this pull request Aug 30, 2019
@olix0r
Update the proxy to linkerd/linkerd2-proxy#3e0e00c (linkerd#2828)
f4da6c2 
commit b27dfb2
Author: Takanori Ishibashi <takanori.1112@gmail.com>
Date:   Wed May 15 05:58:42 2019 +0900

    updaes->updates (linkerd#250)

    Signed-off-by: Takanori Ishibashi <takanori.1112@gmail.com>

commit 16441c2
Author: Eliza Weisman <eliza@buoyant.io>
Date:   Tue May 14 14:40:03 2019 -0700

     Pass router::Config directly to router::Layer (linkerd#253)

    Currently, router `layer`s are constructed with a single argument, a
    type implementing `Recognize`. Then, the entire router stack is built
    with a `router::Config`. However, in linkerd#248, it became necessary to
    provide the config up front when constructing the `router::layer`, as
    the layer is used in a fallback layer. Rather than providing a separate
    type for a preconfigured layer, @olix0r suggested we simply change all
    router layers to accept the `Config` when they're constructed (see
    linkerd#248 (comment)).

    This branch changes `router::Layer` to accept the config up front. The
    `router::Stack` types `make` function now requires no arguments, and the
    implementation of `Service` for `Stack` can be called with any `T` (as
    the target is now ignored).

    Signed-off-by: Eliza Weisman <eliza@buoyant.io>

commit b70c68d
Author: Eliza Weisman <eliza@buoyant.io>
Date:   Wed May 15 13:14:04 2019 -0700

    Load balancers fall back to ORIG_DST when no endpoints exist (linkerd#248)

    Currently, when no endpoints exist in the load balancer for a
    destination, we fail the request. This is because we expect endpoints to
    be discovered by both destination service queries _and_ DNS lookups, so
    if there are no endpoints for a destination, it is assumed to not exist.

    In linkerd/linkerd2#2661, we intend to remove the DNS lookup from the
    proxy and instead fall back to routing requests for which no endpoints
    exist in the destination service to their SO_ORIGINAL_DST IP address.
    This means that the current approach of failing requests when the load
    balancer has no endpoints will no longer work.

    This branch introduces a generic `fallback` layer, which composes a
    primary and secondary service builder into a new layer. The primary
    service can fail requests with an error type that propages the original
    request, allowing the fallback middleware to call the fallback service
    with the same request. Other errors returned by the primary service are
    still propagated upstream.

    In contrast to the approach used in linkerd#240, this fallback middleware is
    generic and not tied directly to a load balancer or a router, and can
    be used for other purposes in the future. It relies on the router cache
    eviction added in linkerd#247 to drain the router when it is not being used,
    rather than proactively destroying the router when endpoints are
    available for the lb, and re-creating it when they exist again.

    A new trait, `HasEndpointStatus`, is added in order to allow the
    discovery lookup to communicate the "no endpoints" state to the
    balancer. In addition, we add a new `Update::NoEndpoints` variant to
    `proxy::resolve::Update`, so that when the control plane sends a no
    endpoints update, we switch from the balancer to the no endpoints state
    _immediately_, rather than waiting for all the endpoints to be
    individually removed. When the balancer has no endpoints, it fails all
    requests with a fallback error, so that the fallback middleware

    A subsequent PR (linkerd#248) will remove the DNS lookups from the discovery
    module.

    Closes linkerd#240.

    Signed-off-by: Eliza Weisman <eliza@buoyant.io>

commit 6525b06
Author: Zahari Dichev <zaharidichev@gmail.com>
Date:   Wed May 15 23:35:09 2019 +0300

    Allow disabling tap by setting an env var (linkerd#252)

    This PR fixes linkerd/linkerd2#2811. Now if
    `LINKERD2_PROXY_TAP_DISABLED` is set, the tap is not served at all. The
    approach taken is that  the `ProxyParts` is changed so the
    `control_listener` is now an `Option` that will be None if tap is
    disabled as this control_listener seems to be exclusively used to serve
    the tap. Feel free to suggest a better approach.

    Signed-off-by: Zahari Dichev <zaharidichev@gmail.com>

commit 91f32db
Author: Zahari Dichev <zaharidichev@gmail.com>
Date:   Thu May 16 00:45:23 2019 +0300

    Assert that outbound TLS works before identity is certified (linkerd#251)

    This commit introduces TLS capabilities to the support server as well as
    tests to ensure that outbound TLS works even when there is no verified
    certificate for the proxy yet.

    Fixes linkerd/linkerd2#2599

    Signed-off-by: Zahari Dichev <zaharidichev@gmail.com>

commit 45aadc6
Author: Sean McArthur <sean@buoyant.io>
Date:   Wed May 15 14:25:39 2019 -0700

    Update h2 to v0.1.19

    Includes a couple HPACK fixes

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

commit 3e0e00c
Author: Oliver Gould <ver@buoyant.io>
Date:   Thu May 16 08:11:06 2019 -0700

    Update mio to 0.6.17 (linkerd#257)

    To pick up tokio-rs/mio#939
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seanmonstar seanmonstar seanmonstar approved these changes

@olix0r olix0r olix0r approved these changes

Assignees

@hawkw hawkw

Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@hawkw @seanmonstar @olix0r