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 17:33:32 UTC
[1/3] trafficserver git commit: TS-4107: backwards compatibility for
StatsProcessor metrics
Repository: trafficserver
Updated Branches:
refs/heads/master 4f98ae2b5 -> 63ca6d80d
TS-4107: backwards compatibility for StatsProcessor metrics
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/980c525e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/980c525e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/980c525e
Branch: refs/heads/master
Commit: 980c525edcdb5beacfb1e59e9c7854fa29191954
Parents: 4f98ae2
Author: James Peach <jp...@apache.org>
Authored: Wed Jan 13 08:18:35 2016 -0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Jan 13 08:22:19 2016 -0800
----------------------------------------------------------------------
mgmt/RecordsConfig.cc | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/980c525e/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 3345f2a..4a3ec43 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1771,6 +1771,13 @@ 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}
,
+
+ // Compatibility note. When we make changes to stats.config.xml, package installers don't generally re[lace the
+ // current file with the .default. This means that we can be running an older config file and a newer traffic_manager.
+ // Since the stats processor never creates metrics, we need to leave the old name for this behind or it will be a
+ // fatal error at startup.
+ {RECT_PROCESS, "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}
,
[2/3] trafficserver git commit: TS-4099: fix HTTP counter metric data
types
Posted by jp...@apache.org.
TS-4099: fix HTTP counter metric data types
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f9c717f1
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f9c717f1
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f9c717f1
Branch: refs/heads/master
Commit: f9c717f1ffe289fa3a8e60e0e18bfe3e8ed5b1b8
Parents: 980c525
Author: James Peach <jp...@apache.org>
Authored: Wed Dec 16 22:07:38 2015 -0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Jan 13 08:22:49 2016 -0800
----------------------------------------------------------------------
proxy/http/HttpConfig.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f9c717f1/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 5a94fcb..96bcaee 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -596,10 +596,10 @@ register_stat_callbacks()
RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.background_fill_bytes_completed_stat", RECD_INT, RECP_PERSISTENT,
(int)http_background_fill_bytes_completed_stat, RecRawStatSyncSum);
- RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.cache_write_errors", RECD_INT, RECP_PERSISTENT,
+ RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.cache_write_errors", RECD_COUNTER, RECP_PERSISTENT,
(int)http_cache_write_errors, RecRawStatSyncSum);
- RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.cache_read_errors", RECD_INT, RECP_PERSISTENT,
+ RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.cache_read_errors", RECD_COUNTER, RECP_PERSISTENT,
(int)http_cache_read_errors, RecRawStatSyncSum);
////////////////////////////////////////////////////////////////////////////////
[3/3] trafficserver git commit: TS-4099: add const to WebOverview
methods
Posted by jp...@apache.org.
TS-4099: add const to WebOverview methods
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/63ca6d80
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/63ca6d80
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/63ca6d80
Branch: refs/heads/master
Commit: 63ca6d80dedc0e6f185e4c76f7f697fc499803d1
Parents: f9c717f
Author: James Peach <jp...@apache.org>
Authored: Wed Dec 16 18:39:24 2015 -0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Jan 13 08:22:55 2016 -0800
----------------------------------------------------------------------
cmd/traffic_manager/WebOverview.cc | 2 +-
cmd/traffic_manager/WebOverview.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/63ca6d80/cmd/traffic_manager/WebOverview.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/WebOverview.cc b/cmd/traffic_manager/WebOverview.cc
index ffa6b85..0d2c420 100644
--- a/cmd/traffic_manager/WebOverview.cc
+++ b/cmd/traffic_manager/WebOverview.cc
@@ -547,7 +547,7 @@ overviewPage::clusterSumData(RecDataT varType, const char *nodeVar, RecData *sum
}
int
-overviewPage::varClusterDataFromName(RecDataT varType, char *nodeVar, RecData *sum)
+overviewPage::varClusterDataFromName(RecDataT varType, const char *nodeVar, RecData *sum)
{
int status = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/63ca6d80/cmd/traffic_manager/WebOverview.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/WebOverview.h b/cmd/traffic_manager/WebOverview.h
index ee88cf1..add7fb8 100644
--- a/cmd/traffic_manager/WebOverview.h
+++ b/cmd/traffic_manager/WebOverview.h
@@ -109,7 +109,7 @@ public:
MgmtString readString(const char *nodeName, const char *name, bool *found = NULL);
void addSelfRecord();
- int varClusterDataFromName(RecDataT varType, char *nodeVar, RecData *sum);
+ int varClusterDataFromName(RecDataT varType, const char *nodeVar, RecData *sum);
private:
ink_mutex accessLock;