You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/01/13 01:58:00 UTC
trafficserver git commit: TS-4107:
proxy.process.ssl.total_success_handshake_count_in has wrong record type
Repository: trafficserver
Updated Branches:
refs/heads/master 7cd050790 -> 8e0f81454
TS-4107: proxy.process.ssl.total_success_handshake_count_in has wrong record type
proxy.process.ssl.total_success_handshake_count_in should be the
metrics generated in the core SSL code, and the old compatible name
proxy.process.ssl.total_success_handshake_count should be generated
as a custom metric. The custom metric needs to be registered in
RecordsConfig.cc but it should be of type RECT_PROCESS not RECT_NODE.
This closes #409.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8e0f8145
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8e0f8145
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8e0f8145
Branch: refs/heads/master
Commit: 8e0f81454fd79cc4dde4bba17b4eb38a7f195c0d
Parents: 7cd0507
Author: James Peach <jp...@apache.org>
Authored: Tue Jan 5 20:18:43 2016 -0800
Committer: James Peach <jp...@apache.org>
Committed: Tue Jan 12 16:57:28 2016 -0800
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 2 +-
mgmt/RecordsConfig.cc | 2 +-
proxy/config/stats.config.xml.default | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8e0f8145/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 0231a15..03d1b4e 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -902,7 +902,7 @@ SSLInitializeStatistics()
// SSL handshake time
RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.total_handshake_time", RECD_INT, RECP_PERSISTENT,
(int)ssl_total_handshake_time_stat, RecRawStatSyncSum);
- RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.total_success_handshake_count", RECD_INT, RECP_PERSISTENT,
+ RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.total_success_handshake_count_in", RECD_INT, RECP_PERSISTENT,
(int)ssl_total_success_handshake_count_in_stat, RecRawStatSyncCount);
RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.total_success_handshake_count_out", RECD_INT, RECP_PERSISTENT,
(int)ssl_total_success_handshake_count_out_stat, RecRawStatSyncCount);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8e0f8145/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 05d87f8..3345f2a 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1771,7 +1771,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_NODE, "proxy.node.log.bytes_lost_before_written_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_NODE, "proxy.process.ssl.total_success_handshake_count_in", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_PROCESS, "proxy.process.ssl.total_success_handshake_count", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
//#
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8e0f8145/proxy/config/stats.config.xml.default
----------------------------------------------------------------------
diff --git a/proxy/config/stats.config.xml.default b/proxy/config/stats.config.xml.default
index 430e2be..da17a2c 100644
--- a/proxy/config/stats.config.xml.default
+++ b/proxy/config/stats.config.xml.default
@@ -1946,11 +1946,12 @@
</expression>
</statistics>
+ <!-- TS-3409. Mirror proxy.process.ssl.total_success_handshake_count_in for backwards compatibility. -->
<statistics
minimum="0">
- <destination>proxy.process.ssl.total_success_handshake_count_in</destination>
+ <destination>proxy.process.ssl.total_success_handshake_count</destination>
<expression>
- proxy.process.ssl.total_success_handshake_count
+ proxy.process.ssl.total_success_handshake_count_in
</expression>
</statistics>