linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run all discovery tests for HTTP/1 as well as HTTP/2 (#556) 

In order to ensure we catch discovery and routing issues arising from different logic for HTTP/1 and HTTP/2 requests, I've modified tests/discovery.rs to run all applicable tests with both HTTP/1 and HTTP/2 requests. The tests themselves are largely unchanged, but now there are separate modules containing HTTP/1 and HTTP/2 versions of a majority of the tests.
This commit is contained in:
Eliza Weisman 2018-03-09 17:24:48 -08:00 committed by GitHub
parent d62a869e68
commit 8da70bb6e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 121 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
proxy/tests/discovery.rs
View File

@ -1,96 +1,140 @@
mod support; mod support;
use self::support::*; use self::support::*;
use std::thread; macro_rules! generate_tests {
(server: $make_server:path, client: $make_client:path) => {
#[test]
fn outbound_asks_controller_api() {
let _ = env_logger::try_init();
let srv = $make_server().route("/", "hello").route("/bye", "bye").run();
let ctrl = controller::new()
.destination("disco.test.svc.cluster.local", srv.addr)
.run();
let proxy = proxy::new().controller(ctrl).outbound(srv).run();
let client = $make_client(proxy.outbound, "disco.test.svc.cluster.local");
#[test] assert_eq!(client.get("/"), "hello");
fn outbound_asks_controller_api() { assert_eq!(client.get("/bye"), "bye");
let _ = env_logger::try_init(); }
let srv = server::new().route("/", "hello").route("/bye", "bye").run(); #[test]
let ctrl = controller::new() fn outbound_reconnects_if_controller_stream_ends() {
.destination("disco.test.svc.cluster.local", srv.addr) let _ = env_logger::try_init();
.run();
let proxy = proxy::new().controller(ctrl).outbound(srv).run();
let client = client::new(proxy.outbound, "disco.test.svc.cluster.local");
assert_eq!(client.get("/"), "hello"); let srv = $make_server().route("/recon", "nect").run();
assert_eq!(client.get("/bye"), "bye"); let ctrl = controller::new()
.destination_close("disco.test.svc.cluster.local")
.destination("disco.test.svc.cluster.local", srv.addr)
.run();
let proxy = proxy::new().controller(ctrl).outbound(srv).run();
let client = $make_client(proxy.outbound, "disco.test.svc.cluster.local");
assert_eq!(client.get("/recon"), "nect");
}
#[test]
#[cfg_attr(not(feature = "flaky_tests"), ignore)]
fn outbound_times_out() {
use std::thread;
let _ = env_logger::try_init();
let mut env = config::TestEnv::new();
// set the bind timeout to 100 ms.
env.put(config::ENV_BIND_TIMEOUT, "100".to_owned());
let srv = $make_server().route("/hi", "hello").run();
let addr = srv.addr.clone();
let ctrl = controller::new()
// when the proxy requests the destination, sleep for 500 ms, and then
// return the correct destination
.destination_fn("disco.test.svc.cluster.local", move || {
thread::sleep(Duration::from_millis(500));
Some(controller::destination_update(addr))
})
.run();
let proxy = proxy::new()
.controller(ctrl)
.outbound(srv)
.run_with_test_env(env);
let client = $make_client(proxy.outbound, "disco.test.svc.cluster.local");
let mut req = client.request_builder("/");
let rsp = client.request(req.method("GET"));
// the request should time out
assert_eq!(rsp.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
}
#[test]
fn outbound_uses_orig_dst_if_not_local_svc() {
let _ = env_logger::try_init();
let srv = $make_server()
.route("/", "hello")
.route("/bye", "bye")
.run();
let ctrl = controller::new()
// no controller rule for srv
.run();
let proxy = proxy::new()
.controller(ctrl)
// set outbound orig_dst to srv
.outbound(srv)
.run();
let client = $make_client(proxy.outbound, "versioncheck.conduit.io");
assert_eq!(client.get("/"), "hello");
assert_eq!(client.get("/bye"), "bye");
}
#[test]
fn outbound_asks_controller_without_orig_dst() {
let _ = env_logger::try_init();
let srv = $make_server()
.route("/", "hello")
.route("/bye", "bye")
.run();
let ctrl = controller::new()
.destination("disco.test.svc.cluster.local", srv.addr)
.run();
let proxy = proxy::new()
.controller(ctrl)
// don't set srv as outbound(), so that SO_ORIGINAL_DST isn't
// used as a backup
.run();
let client = $make_client(proxy.outbound, "disco.test.svc.cluster.local");
assert_eq!(client.get("/"), "hello");
assert_eq!(client.get("/bye"), "bye");
}
}
} }
#[test] mod http2 {
fn outbound_asks_controller_about_authority() { use super::support::*;
let _ = env_logger::try_init();
let srv = server::new().route("/", "hello").route("/bye", "bye").run(); generate_tests! { server: server::new, client: client::new }
let ctrl = controller::new()
.destination("disco.test.svc.cluster.local", srv.addr)
.run();
let proxy = proxy::new().controller(ctrl).run();
let client = client::new(proxy.outbound, "disco.test.svc.cluster.local");
assert_eq!(client.get("/"), "hello");
assert_eq!(client.get("/bye"), "bye");
} }
#[test] mod http1 {
fn outbound_reconnects_if_controller_stream_ends() { use super::support::*;
let _ = env_logger::try_init();
let srv = server::new().route("/recon", "nect").run(); generate_tests! { server: server::http1, client: client::http1 }
let ctrl = controller::new()
.destination_close("disco.test.svc.cluster.local") mod absolute_uris {
.destination("disco.test.svc.cluster.local", srv.addr) use super::super::support::*;
.run();
let proxy = proxy::new().controller(ctrl).outbound(srv).run(); generate_tests! {
let client = client::new(proxy.outbound, "disco.test.svc.cluster.local"); server: server::http1,
client: client::http1_absolute_uris
}
}
assert_eq!(client.get("/recon"), "nect");
} }
#[test]
fn outbound_http1_asks_controller_about_host() {
let _ = env_logger::try_init();
let srv = server::http1()
.route("/", "hello")
.route("/bye", "bye")
.run();
let ctrl = controller::new()
.destination("disco.test.svc.cluster.local", srv.addr)
.run();
let proxy = proxy::new()
.controller(ctrl)
// don't set srv as outbound(), so that SO_ORIGINAL_DST isn't
// used as a backup
.run();
let client = client::http1(proxy.outbound, "disco.test.svc.cluster.local");
assert_eq!(client.get("/"), "hello");
assert_eq!(client.get("/bye"), "bye");
}
#[test]
fn outbound_http1_asks_controller_api() {
let _ = env_logger::try_init();
let srv = server::http1()
.route("/", "hello")
.route("/bye", "bye")
.run();
let ctrl = controller::new()
.destination("disco.test.svc.cluster.local", srv.addr)
.run();
let proxy = proxy::new()
.controller(ctrl)
// don't set srv as outbound(), so that SO_ORIGINAL_DST isn't
// used as a backup
.run();
let client = client::http1(proxy.outbound, "disco.test.svc.cluster.local");
assert_eq!(client.get("/"), "hello");
assert_eq!(client.get("/bye"), "bye");
}
#[test] #[test]
fn outbound_updates_newer_services() { fn outbound_updates_newer_services() {
@ -114,58 +158,3 @@ fn outbound_updates_newer_services() {
let client2 = client::http1(proxy.outbound, "disco.test.svc.cluster.local"); let client2 = client::http1(proxy.outbound, "disco.test.svc.cluster.local");
assert_eq!(client2.get("/h1"), "hello h1"); assert_eq!(client2.get("/h1"), "hello h1");
} }
#[test]
#[cfg_attr(not(feature = "flaky_tests"), ignore)]
fn outbound_times_out() {
let _ = env_logger::try_init();
let mut env = config::TestEnv::new();
// set the bind timeout to 100 ms.
env.put(config::ENV_BIND_TIMEOUT, "100".to_owned());
let srv = server::http1().route("/h1", "hello h1").run();
let addr = srv.addr.clone();
let ctrl = controller::new()
// when the proxy requests the destination, sleep for 500 ms, and then
// return the correct destination
.destination_fn("disco.test.svc.cluster.local", move || {
thread::sleep(Duration::from_millis(500));
Some(controller::destination_update(addr))
})
.run();
let proxy = proxy::new()
.controller(ctrl)
.outbound(srv)
.run_with_test_env(env);
let client = client::http2(proxy.outbound, "disco.test.svc.cluster.local");
let mut req = client.request_builder("/");
let rsp = client.request(req.method("GET"));
// the request should time out
assert_eq!(rsp.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
}
#[test]
fn outbound_uses_orig_dst_if_not_local_svc() {
let _ = env_logger::try_init();
let srv = server::new()
.route("/", "hello")
.route("/bye", "bye")
.run();
let ctrl = controller::new()
// no controller rule for srv
.run();
let proxy = proxy::new()
.controller(ctrl)
// set outbound orig_dst to srv
.outbound(srv)
.run();
let client = client::new(proxy.outbound, "versioncheck.conduit.io");
assert_eq!(client.get("/"), "hello");
assert_eq!(client.get("/bye"), "bye");
}