You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2015/07/02 09:10:53 UTC
[1/3] trafficserver git commit: TS-3440: Connect retries shouldn't
happen if the connection has succeeeded and data has been sent
Repository: trafficserver
Updated Branches:
refs/heads/master 7b0a57f43 -> 0b2c2f96d
TS-3440: Connect retries shouldn't happen if the connection has succeeeded and data has been sent
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/440a1451
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/440a1451
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/440a1451
Branch: refs/heads/master
Commit: 440a14513e59baf21e55b07f0dd4aa39bac232de
Parents: 65fa4ec
Author: Brian Geffon <br...@apache.org>
Authored: Thu Jul 2 00:08:11 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Thu Jul 2 00:08:11 2015 -0700
----------------------------------------------------------------------
proxy/http/HttpTransact.cc | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/440a1451/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 59ee0fc..06870ae 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -3643,6 +3643,17 @@ HttpTransact::handle_response_from_server(State *s)
s->current.server->set_connect_fail(EUSERS); // too many users
handle_server_connection_not_open(s);
break;
+ case CONNECTION_CLOSED:
+ /* fall through */
+ case PARSE_ERROR:
+ /* fall through */
+ case BAD_INCOMING_RESPONSE: {
+ // this case should not be allowed to retry because we'll end up making another request
+ DebugTxn("http_trans", "[handle_response_from_server] Transaction received a bad response or a partial response, not retrying...");
+ SET_VIA_STRING(VIA_DETAIL_SERVER_CONNECT, VIA_DETAIL_SERVER_FAILURE);
+ handle_server_connection_not_open(s);
+ break;
+ }
case OPEN_RAW_ERROR:
/* fall through */
case CONNECTION_ERROR:
@@ -3650,12 +3661,6 @@ HttpTransact::handle_response_from_server(State *s)
case STATE_UNDEFINED:
/* fall through */
case INACTIVE_TIMEOUT:
- /* fall through */
- case PARSE_ERROR:
- /* fall through */
- case CONNECTION_CLOSED:
- /* fall through */
- case BAD_INCOMING_RESPONSE:
// Set to generic I/O error if not already set specifically.
if (!s->current.server->had_connect_fail())
s->current.server->set_connect_fail(EIO);
[2/3] trafficserver git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dc2b07ba
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dc2b07ba
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dc2b07ba
Branch: refs/heads/master
Commit: dc2b07ba90a610024fcf389eb904738f0d80fc80
Parents: 440a145 7b0a57f
Author: Brian Geffon <br...@apache.org>
Authored: Thu Jul 2 00:08:20 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Thu Jul 2 00:08:20 2015 -0700
----------------------------------------------------------------------
Makefile.am | 9 +-
.../configuration/records.config.en.rst | 6 ++
iocore/hostdb/I_HostDBProcessor.h | 1 -
iocore/hostdb/P_HostDBProcessor.h | 10 +-
iocore/net/P_SSLConfig.h | 1 +
iocore/net/P_SSLNetVConnection.h | 27 +++++
iocore/net/SSLConfig.cc | 3 +
iocore/net/SSLNetVConnection.cc | 65 +++++++++++-
iocore/net/SSLNextProtocolAccept.cc | 3 +-
iocore/net/UnixNetVConnection.cc | 23 ++++-
mgmt/RecordsConfig.cc | 20 +---
proxy/ProtocolProbeSessionAccept.cc | 33 ++++--
proxy/http/HttpClientSession.cc | 13 +++
proxy/http/HttpSM.cc | 60 ++++++-----
tools/changelog.pl | 102 +++++++++++++++++++
15 files changed, 312 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
[3/3] trafficserver git commit: TS-3440: Update tests
Posted by br...@apache.org.
TS-3440: Update tests
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0b2c2f96
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0b2c2f96
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0b2c2f96
Branch: refs/heads/master
Commit: 0b2c2f96d449e4d19858f947fdc2a4bd204631a9
Parents: dc2b07b
Author: Brian Geffon <br...@apache.org>
Authored: Thu Jul 2 00:10:45 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Thu Jul 2 00:10:45 2015 -0700
----------------------------------------------------------------------
ci/tsqa/tests/test_connect_attempts.py | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0b2c2f96/ci/tsqa/tests/test_connect_attempts.py
----------------------------------------------------------------------
diff --git a/ci/tsqa/tests/test_connect_attempts.py b/ci/tsqa/tests/test_connect_attempts.py
index bb5e1a2..d5b7117 100644
--- a/ci/tsqa/tests/test_connect_attempts.py
+++ b/ci/tsqa/tests/test_connect_attempts.py
@@ -183,10 +183,6 @@ class TestOriginServerConnectAttempts(helpers.EnvironmentCase):
ret = requests.get(url)
self.assertEqual(ret.status_code, 504)
- # TODO: FIX THIS!!! The test is correct, ATS isn't!
- # we should fail in this case-- or at least have a config which lets you control
- # TODO: remove once TS-3440 is resolved
- @helpers.unittest.expectedFailure
def test_partial_response_origin(self):
'''
Verify that we get 504s from origins that return a partial_response