You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/12/23 16:15:11 UTC
[1/4] trafficserver git commit: [TS-3248]: Fix with Susan's help to
resolve crash introduced in TS-3189
Repository: trafficserver
Updated Branches:
refs/heads/5.2.x 66504c160 -> 07a2f9067
[TS-3248]: Fix with Susan's help to resolve crash introduced in TS-3189
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d66bf29d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d66bf29d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d66bf29d
Branch: refs/heads/5.2.x
Commit: d66bf29db25798e68f5a13d187a65679d0639b19
Parents: 66504c1
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Sun Dec 21 03:04:56 2014 +0000
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Tue Dec 23 08:03:51 2014 -0700
----------------------------------------------------------------------
proxy/http/HttpSM.cc | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d66bf29d/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 5f07f8c..faf4451 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -575,7 +575,7 @@ HttpSM::attach_client_session(HttpClientSession * client_vc, IOBufferReader * bu
// this hook maybe asynchronous, we need to disable IO on
// client but set the continuation to be the state machine
// so if we get an timeout events the sm handles them
- ua_entry->read_vio = client_vc->do_io_read(this, 0, NULL);
+ ua_entry->read_vio = client_vc->do_io_read(this, 0, buffer_reader->mbuf);
/////////////////////////
// set up timeouts //
@@ -1989,6 +1989,11 @@ HttpSM::state_send_server_request_header(int event, void *data)
handle_server_setup_error(event, data);
break;
+ case VC_EVENT_READ_COMPLETE:
+ // new event expected due to TS-3189
+ DebugSM("http_ss", "read complete due to 0 byte do_io_read");
+ break;
+
default:
ink_release_assert(0);
break;
@@ -5658,7 +5663,7 @@ HttpSM::attach_server_session(HttpServerSession * s)
// first tunnel instead of the producer of the second tunnel.
// The real read is setup in setup_server_read_response_header()
//
- server_entry->read_vio = server_session->do_io_read(this, 0, NULL);
+ server_entry->read_vio = server_session->do_io_read(this, 0, server_session->read_buffer);
// Transfer control of the write side as well
server_session->do_io_write(this, 0, NULL);
[4/4] trafficserver git commit: Update STATUS
Posted by zw...@apache.org.
Update STATUS
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/07a2f906
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/07a2f906
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/07a2f906
Branch: refs/heads/5.2.x
Commit: 07a2f906706d01c9b5bd0c6ecbb51f13c327dc05
Parents: 98e0d9c
Author: Leif Hedstrom <le...@ogre.com>
Authored: Tue Dec 23 08:14:26 2014 -0700
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Tue Dec 23 08:14:26 2014 -0700
----------------------------------------------------------------------
STATUS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/07a2f906/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 58ee6bb..cc19811 100644
--- a/STATUS
+++ b/STATUS
@@ -8,7 +8,7 @@ The current version of this file can be found at:
Release history:
- 5.2.0 : Released on Dec 22nd, 2014
+ 5.2.0 : Released on Dec 29nd, 2014
5.1.2 : Released on Dec 15th, 2014
5.1.1 : Released on Oct 31st, 2014
5.1.0 : Released on Sep 18th, 2014
[3/4] trafficserver git commit: Updated CHANGES.
Posted by zw...@apache.org.
Updated CHANGES.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/98e0d9c6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/98e0d9c6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/98e0d9c6
Branch: refs/heads/5.2.x
Commit: 98e0d9c618936eeb477e8d46d16c9a82799df926
Parents: d260d20
Author: Leif Hedstrom <le...@ogre.com>
Authored: Tue Dec 23 08:13:10 2014 -0700
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Tue Dec 23 08:13:29 2014 -0700
----------------------------------------------------------------------
CHANGES | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/98e0d9c6/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c6e6f03..b951b51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,12 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.2.0
- *) [TS-3226] Move access of read vio inside the mutex to prevent ntodo corruption
+ *) [TS-3248] Fix to resolve crash introduced in TS-3189.
+
+ *) [TS-3254] Patches to fix perl get_stats API.
+
+ *) [TS-3226] Move access of read vio inside the mutex to prevent ntodo
+ corruption.
*) [TS-3244] stats_over_http plugin does not use optional path argument.
[2/4] trafficserver git commit: [TS-3254] : patch from James to fix
perl get_stats API
Posted by zw...@apache.org.
[TS-3254] : patch from James to fix perl get_stats API
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d260d201
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d260d201
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d260d201
Branch: refs/heads/5.2.x
Commit: d260d201ff4863628bf48af2f64a796cf58492ee
Parents: d66bf29
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Mon Dec 22 17:14:00 2014 +0000
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Tue Dec 23 08:06:15 2014 -0700
----------------------------------------------------------------------
lib/perl/lib/Apache/TS/AdminClient.pm | 49 ++++++++++++++++--------------
1 file changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d260d201/lib/perl/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm b/lib/perl/lib/Apache/TS/AdminClient.pm
index 676ad74..1c2f0bd 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -28,7 +28,6 @@ use IO::Select;
use Apache::TS;
-
# Mgmt API command constants, should track ts/mgmtapi.h
use constant {
TS_FILE_READ => 0,
@@ -54,10 +53,9 @@ use constant {
TS_STATS_RESET => 20
};
-# We treat both REC_INT and REC_COUNTER the same here
use constant {
TS_REC_INT => 0,
- TS_REC_COUNTER => 0,
+ TS_REC_COUNTER => 1,
TS_REC_FLOAT => 2,
TS_REC_STRING => 3
};
@@ -204,29 +202,36 @@ sub get_stat {
return undef unless defined($self->{_socket});
return undef unless $self->{_select}->can_write(10);
-# This is a total hack for now, we need to wrap this into the proper mgmt API library.
- $self->{_socket}->print(pack("sla*", TS_RECORD_GET, length($stat)), $stat);
+ # This is a total hack for now, we need to wrap this into the proper mgmt API library.
+ # The request format is:
+ # MGMT_MARSHALL_INT: message length
+ # MGMT_MARSHALL_INT: TS_RECORD_GET
+ # MGMT_MARSHALL_STRING: record name
+ my $msg = pack("ll/Z", TS_RECORD_GET, $stat);
+ $self->{_socket}->print(pack("l/a", $msg));
$res = $self->_do_read();
- my @resp = unpack("slls", $res);
- return undef unless (scalar(@resp) == 4);
-
- if ($resp[0] == TS_ERR_OKAY) {
- if ($resp[3] < TS_REC_FLOAT) {
- @resp = unpack("sllsq", $res);
- return undef unless (scalar(@resp) == 5);
- return int($resp[4]);
+ # The response format is:
+ # MGMT_MARSHALL_INT: message length
+ # MGMT_MARSHALL_INT: error code
+ # MGMT_MARSHALL_INT: record type
+ # MGMT_MARSHALL_STRING: record name
+ # MGMT_MARSHALL_DATA: record data
+ ($msg) = unpack("l/a", $res);
+ my ($ecode, $type, $name, $value) = unpack("l l l/Z l/a", $msg);
+
+ if ($ecode == TS_ERR_OKAY) {
+ if ($type == TS_REC_INT || $type == TS_REC_COUNTER) {
+ my ($ival) = unpack("q", $value);
+ return $ival;
}
- elsif ($resp[3] == TS_REC_FLOAT) {
- @resp = unpack("sllsf", $res);
- return undef unless (scalar(@resp) == 5);
- return $resp[4];
+ elsif ($type == TS_REC_FLOAT) {
+ my ($fval) = unpack("f", $value);
+ return $fval;
}
- elsif ($resp[3] == TS_REC_STRING) {
- @resp = unpack("sllsa*", $res);
- return undef unless (scalar(@resp) == 5);
- my @result = split($stat, $resp[4]);
- return $result[0];
+ elsif ($type == TS_REC_STRING) {
+ my ($sval) = unpack("Z*", $value);
+ return $sval;
}
}