You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2015/09/11 23:25:36 UTC
[1/3] trafficserver git commit: TS-3906: Updates to the active and
idle queues
Repository: trafficserver
Updated Branches:
refs/heads/6.0.x e31e4e66c -> 59b1e44c9
TS-3906: Updates to the active and idle queues
(cherry picked from commit d620b2a5fb25939e87e77143f0712595daabba46)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3e723dfd
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3e723dfd
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3e723dfd
Branch: refs/heads/6.0.x
Commit: 3e723dfd0ccb542d35c2672442f319e42cc33350
Parents: e31e4e6
Author: Bryan Call <bc...@apache.org>
Authored: Fri Sep 11 14:18:14 2015 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Sep 11 14:21:50 2015 -0700
----------------------------------------------------------------------
iocore/net/UnixNet.cc | 7 +++++--
proxy/http/HttpClientSession.cc | 2 +-
proxy/http2/Http2ConnectionState.cc | 8 ++++++++
3 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3e723dfd/iocore/net/UnixNet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
index 3c454a9..131a12f 100644
--- a/iocore/net/UnixNet.cc
+++ b/iocore/net/UnixNet.cc
@@ -619,7 +619,7 @@ NetHandler::manage_keep_alive_queue()
Debug("net_queue", "max_connections_per_thread_in: %d total_connections_in: %d active_queue_size: %d keep_alive_queue_size: %d",
max_connections_per_thread_in, total_connections_in, active_queue_size, keep_alive_queue_size);
- if (total_connections_in <= max_connections_per_thread_in) {
+ if (!max_connections_per_thread_in || total_connections_in <= max_connections_per_thread_in) {
return;
}
@@ -672,7 +672,10 @@ NetHandler::_close_vc(UnixNetVConnection *vc, ink_hrtime now, int &handle_event,
++closed;
} else {
vc->next_inactivity_timeout_at = now;
- keep_alive_queue.head->handleEvent(EVENT_IMMEDIATE, NULL);
+ // create a dummy event
+ Event event;
+ event.ethread = this_ethread();
+ keep_alive_queue.head->handleEvent(EVENT_IMMEDIATE, &event);
++handle_event;
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3e723dfd/proxy/http/HttpClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.cc b/proxy/http/HttpClientSession.cc
index f02834c..eaa8613 100644
--- a/proxy/http/HttpClientSession.cc
+++ b/proxy/http/HttpClientSession.cc
@@ -529,9 +529,9 @@ HttpClientSession::release(IOBufferReader *r)
SET_HANDLER(&HttpClientSession::state_keep_alive);
ka_vio = this->do_io_read(this, INT64_MAX, read_buffer);
ink_assert(slave_ka_vio != ka_vio);
- client_vc->add_to_keep_alive_queue();
client_vc->set_inactivity_timeout(HRTIME_SECONDS(ka_in));
client_vc->cancel_active_timeout();
+ client_vc->add_to_keep_alive_queue();
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3e723dfd/proxy/http2/Http2ConnectionState.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index e14f005..86f215e 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -820,6 +820,7 @@ Http2ConnectionState::create_stream(Http2StreamId new_id)
ink_assert(client_streams_count < UINT32_MAX);
++client_streams_count;
+ ua_session->get_netvc()->add_to_active_queue();
return new_stream;
}
@@ -860,6 +861,9 @@ Http2ConnectionState::cleanup_streams()
s = next;
}
client_streams_count = 0;
+ if (!is_state_closed()) {
+ ua_session->get_netvc()->add_to_keep_alive_queue();
+ }
}
void
@@ -870,6 +874,10 @@ Http2ConnectionState::delete_stream(Http2Stream *stream)
ink_assert(client_streams_count > 0);
--client_streams_count;
+
+ if (client_streams_count == 0) {
+ ua_session->get_netvc()->add_to_keep_alive_queue();
+ }
}
void
[2/3] trafficserver git commit: TS-3907: Configuration cleanup for
6.0.0 release
Posted by bc...@apache.org.
TS-3907: Configuration cleanup for 6.0.0 release
(cherry picked from commit 00b697d899f3fd87d6d891fd46dda804d4680c70)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ebe3c146
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ebe3c146
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ebe3c146
Branch: refs/heads/6.0.x
Commit: ebe3c146ed1fc035f8933459f166fe7e49e75689
Parents: 3e723df
Author: Bryan Call <bc...@apache.org>
Authored: Fri Sep 11 14:20:25 2015 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Sep 11 14:21:59 2015 -0700
----------------------------------------------------------------------
mgmt/RecordsConfig.cc | 2 +-
proxy/config/records.config.default.in | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ebe3c146/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index abf4b8f..8eb21b1 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -194,7 +194,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.diags.action.tags", RECD_STRING, NULL, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.diags.show_location", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.diags.show_location", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.diags.output.diag", RECD_STRING, "E", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ebe3c146/proxy/config/records.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in
index b8837d5..357d863 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -25,6 +25,12 @@ CONFIG proxy.config.exec_thread.affinity INT 1
CONFIG proxy.config.http.server_ports STRING 8080
##############################################################################
+# Enable HTTP/2 Support. Docs:
+# https://docs.trafficserver.apache.org/records.config#http-2-configuration
+##############################################################################
+CONFIG proxy.config.http2.enabled INT 0
+
+##############################################################################
# Via: headers. Docs:
# https://docs.trafficserver.apache.org/records.config#proxy-config-http-insert-response-via-str
##############################################################################
@@ -120,6 +126,8 @@ CONFIG proxy.config.http.cache.heuristic_lm_factor FLOAT 0.10
# https://docs.trafficserver.apache.org/records.config#network
##############################################################################
CONFIG proxy.config.net.connections_throttle INT 30000
+CONFIG proxy.config.net.max_connections_in INT 30000
+CONFIG proxy.config.net.max_connections_active_in INT 10000
##############################################################################
# RAM and disk cache configurations. Docs:
[3/3] trafficserver git commit: Updated release notes
Posted by bc...@apache.org.
Updated release notes
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/59b1e44c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/59b1e44c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/59b1e44c
Branch: refs/heads/6.0.x
Commit: 59b1e44c977b595cbe9f862011b479b0d5137843
Parents: ebe3c14
Author: Bryan Call <bc...@apache.org>
Authored: Fri Sep 11 14:25:18 2015 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Sep 11 14:25:18 2015 -0700
----------------------------------------------------------------------
CHANGES | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/59b1e44c/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1c84e56..c049adf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -153,6 +153,7 @@ Bug:
*) [TS-3824] Wrong #include of pcre.h in a couple of plugins
*) [TS-3825] epic plugin does not compile on OmniOS
*) [TS-3828] HEAD requests hang when origin returns Transfer-Encoding: Chunked
+ *) [TS-3834] Close the client session after sending GOAWAY with errors
*) [TS-3836] Add error handling of Stream Priority
*) [TS-3839] Regression test fails by new overridable setting
*) [TS-3844] Don't send GOAWAY frame when receiving a DATA frame on a closed stream
@@ -170,6 +171,7 @@ Bug:
*) [TS-3895] Mutex leak for TLS connections going to the origin
*) [TS-3896] Crash in OpenDir::close_write
*) [TS-3897] Getting 404s with regex_map
+ *) [TS-3902] Wrong conditional for checking on continuation frame and to send the go_away frame
Improvement:
*) [TS-667] Ability to keep traffic server from initializing the wrong disks when using RAW disk mode.
@@ -262,6 +264,8 @@ Improvement:
*) [TS-3842] Add stats for HTTP/2 errors
*) [TS-3845] HPACK error when trying to delete entries from an empty table
*) [TS-3850] Add accept and no activity timeouts for HTTP/2
+ *) [TS-3906] Updates to the active and idle queues
+ *) [TS-3907] Configuration cleanup for 6.0.0 release
New Feature:
*) [TS-2150] Add Milestone log tags