forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(http2): revert http2 refactor causing a client hang

Browse Source 
This reverts commit 7b7dcc8f68.
This commit is contained in:
Sean McArthur
2019-01-24 11:00:12 -08:00
parent 078ed82dd5
commit 9aa7e99010
3 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@@ -23,7 +23,7 @@ futures = "0.1.21"
futures-cpupool = { version = "0.1.6", optional = true } futures-cpupool = { version = "0.1.6", optional = true }
http = "0.1.15" http = "0.1.15"
httparse = "1.0" httparse = "1.0"
h2 = "0.1.15" h2 = "0.1.10"
iovec = "0.1" iovec = "0.1"
itoa = "0.4.1" itoa = "0.4.1"
log = "0.4" log = "0.4"
@@ -52,6 +52,7 @@ serde_json = "1.0"
[features] [features]
default = [ default = [
"__internal_flaky_tests",
"runtime", "runtime",
] ]
runtime = [ runtime = [
@@ -65,6 +66,7 @@ runtime = [
"tokio-timer", "tokio-timer",
] ]
nightly = [] nightly = []
__internal_flaky_tests = []
__internal_happy_eyeballs_tests = [] __internal_happy_eyeballs_tests = []
[profile.release] [profile.release]

47
src/proto/h2/client.rs
View File

@@ -1,17 +1,22 @@
use bytes::IntoBuf; use bytes::IntoBuf;
use futures::{Async, Future, Poll, Stream}; use futures::{Async, Future, Poll, Stream};
use futures::future::{self, Either};
use futures::sync::mpsc;
use h2::client::{Builder, Handshake, SendRequest}; use h2::client::{Builder, Handshake, SendRequest};
use tokio_io::{AsyncRead, AsyncWrite}; use tokio_io::{AsyncRead, AsyncWrite};
use headers::content_length_parse_all; use headers::content_length_parse_all;
use body::Payload; use body::Payload;
use ::common::Exec; use ::common::{Exec, Never};
use headers; use headers;
use ::proto::Dispatched; use ::proto::Dispatched;
use super::{PipeToSendStream, SendBuf}; use super::{PipeToSendStream, SendBuf};
use ::{Body, Request, Response}; use ::{Body, Request, Response};
type ClientRx<B> = ::client::dispatch::Receiver<Request<B>, Response<Body>>; type ClientRx<B> = ::client::dispatch::Receiver<Request<B>, Response<Body>>;
/// An mpsc channel is used to help notify the `Connection` task when *all*
/// other handles to it have been dropped, so that it can shutdown.
type ConnDropRef = mpsc::Sender<Never>;
pub(crate) struct Client<T, B> pub(crate) struct Client<T, B>
where where
@@ -24,7 +29,7 @@ where
enum State<T, B> where B: IntoBuf { enum State<T, B> where B: IntoBuf {
Handshaking(Handshake<T, B>), Handshaking(Handshake<T, B>),
Ready(SendRequest<B>), Ready(SendRequest<B>, ConnDropRef),
} }
impl<T, B> Client<T, B> impl<T, B> Client<T, B>
@@ -59,13 +64,40 @@ where
let next = match self.state { let next = match self.state {
State::Handshaking(ref mut h) => { State::Handshaking(ref mut h) => {
let (request_tx, conn) = try_ready!(h.poll().map_err(::Error::new_h2)); let (request_tx, conn) = try_ready!(h.poll().map_err(::Error::new_h2));
// An mpsc channel is used entirely to detect when the
// 'Client' has been dropped. This is to get around a bug
// in h2 where dropping all SendRequests won't notify a
// parked Connection.
let (tx, rx) = mpsc::channel(0);
let rx = rx.into_future()
.map(|(msg, _)| match msg {
Some(never) => match never {},
None => (),
})
.map_err(|_| -> Never { unreachable!("mpsc cannot error") });
let fut = conn let fut = conn
.inspect(|_| trace!("connection complete")) .inspect(|_| trace!("connection complete"))
.map_err(|e| debug!("connection error: {}", e)); .map_err(|e| debug!("connection error: {}", e))
.select2(rx)
.then(|res| match res {
Ok(Either::A(((), _))) |
Err(Either::A(((), _))) => {
// conn has finished either way
Either::A(future::ok(()))
},
Ok(Either::B(((), conn))) => {
// mpsc has been dropped, hopefully polling
// the connection some more should start shutdown
// and then close
trace!("send_request dropped, starting conn shutdown");
Either::B(conn)
}
Err(Either::B((never, _))) => match never {},
});
self.executor.execute(fut)?; self.executor.execute(fut)?;
State::Ready(request_tx) State::Ready(request_tx, tx)
}, },
State::Ready(ref mut tx) => { State::Ready(ref mut tx, ref conn_dropper) => {
try_ready!(tx.poll_ready().map_err(::Error::new_h2)); try_ready!(tx.poll_ready().map_err(::Error::new_h2));
match self.rx.poll() { match self.rx.poll() {
Ok(Async::Ready(Some((req, mut cb)))) => { Ok(Async::Ready(Some((req, mut cb)))) => {
@@ -98,6 +130,11 @@ where
match pipe.poll() { match pipe.poll() {
Ok(Async::Ready(())) | Err(()) => (), Ok(Async::Ready(())) | Err(()) => (),
Ok(Async::NotReady) => { Ok(Async::NotReady) => {
let conn_drop_ref = conn_dropper.clone();
let pipe = pipe.then(move |x| {
drop(conn_drop_ref);
x
});
self.executor.execute(pipe)?; self.executor.execute(pipe)?;
} }
} }

3
tests/integration.rs
View File

@@ -333,6 +333,9 @@ t! {
; ;
} }
// In rare cases, the h2 client connection does not shutdown, resulting
// in this test simply hanging... :(
#[cfg(feature = "__internal_flaky_tests")]
t! { t! {
http2_parallel_10, http2_parallel_10,
parallel: 0..10 parallel: 0..10