walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Create at least the same number of h2 session as load balancing hosts

This commit is contained in:
Tatsuhiro Tsujikawa 2016-03-19 12:00:27 +09:00
parent 7a1e0eb618
commit a1e0bd134e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shrpx_client_handler.cc
View File

@ -732,10 +732,17 @@ ClientHandler::get_downstream_connection(Downstream *downstream) {
} }
if (group.proto == PROTO_HTTP2) { if (group.proto == PROTO_HTTP2) {
if (group.http2_freelist.empty()) { if (group.http2_freelist.empty() ||
group.http2_freelist.size() < group.addrs.size()) {
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
CLOG(INFO, this) if (group.http2_freelist.empty()) {
<< "http2_freelist is empty; create new Http2Session"; CLOG(INFO, this)
<< "http2_freelist is empty; create new Http2Session";
} else {
CLOG(INFO, this) << "Create new Http2Session; current "
<< group.http2_freelist.size() << ", min "
<< group.addrs.size();
}
} }
auto session = make_unique<Http2Session>( auto session = make_unique<Http2Session>(
conn_.loop, worker_->get_cl_ssl_ctx(), worker_, &group); conn_.loop, worker_->get_cl_ssl_ctx(), worker_, &group);
@ -744,8 +751,6 @@ ClientHandler::get_downstream_connection(Downstream *downstream) {
auto http2session = group.http2_freelist.head; auto http2session = group.http2_freelist.head;
// TODO max_concurrent_streams option must be independent from
// frontend and backend.
if (http2session->max_concurrency_reached(1)) { if (http2session->max_concurrency_reached(1)) {
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
CLOG(INFO, this) << "Maximum streams are reached for Http2Session(" CLOG(INFO, this) << "Maximum streams are reached for Http2Session("