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/01/13 22:12:04 UTC
[1/2] git commit: Revert "TS-2483 Add to docs."
Updated Branches:
refs/heads/master 283aa3bca -> 7af657e45
Revert "TS-2483 Add to docs."
This reverts commit c89d14621e2fd7ef1350990960f5a33aa3ff06d1.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/74763d22
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/74763d22
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/74763d22
Branch: refs/heads/master
Commit: 74763d22dc6ade6aaa978af4273377f29fc4cb41
Parents: 283aa3b
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jan 13 14:09:30 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Jan 13 14:09:30 2014 -0700
----------------------------------------------------------------------
doc/reference/commands/traffic_line.en.rst | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/74763d22/doc/reference/commands/traffic_line.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/commands/traffic_line.en.rst b/doc/reference/commands/traffic_line.en.rst
index 2e7938c..08683fb 100644
--- a/doc/reference/commands/traffic_line.en.rst
+++ b/doc/reference/commands/traffic_line.en.rst
@@ -129,7 +129,6 @@ The :option:`traffic_line -r` option accepts the following variable names::
proxy.node.restarts.proxy.start_time
proxy.node.restarts.proxy.stop_time
proxy.node.restarts.proxy.restart_count
- proxy.node.restarts.proxy.cache_ready_time
proxy.node.version.manager.short
proxy.node.version.manager.long
proxy.node.version.manager.build_number
[2/2] git commit: Revert "TS-2483 Add a new metric,
proxy.node.restarts.proxy.cache_ready_time, "
Posted by zw...@apache.org.
Revert "TS-2483 Add a new metric, proxy.node.restarts.proxy.cache_ready_time,"
This reverts commit 5df2cac3846d7d2f9ae255b051f748d25773a8bc.
Conflicts:
CHANGES
This does not cooperate nicely with librecords. Might be bugs in
both librecords and here, but backing out for now.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7af657e4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7af657e4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7af657e4
Branch: refs/heads/master
Commit: 7af657e45507667c92a88a2be175df05c57eb655
Parents: 74763d2
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jan 13 14:11:23 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Jan 13 14:11:23 2014 -0700
----------------------------------------------------------------------
CHANGES | 5 -----
mgmt/RecordsConfig.cc | 2 --
proxy/Main.cc | 4 ----
3 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7af657e4/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c71469d..f5e4224 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,11 +16,6 @@ Changes with Apache Traffic Server 4.2.0
*) [TS-2486] Eliminate SIMPLE_MEMCPY_INIT define.
- *) [TS-2483] Add a new metric, proxy.node.restarts.proxy.cache_ready_time,
- tracking absolute time when the cache started (finished
- initialization). Until cache is available, or no cache configured, this
- metric stays at a value of "0".
-
*) [TS-2476] Fix size_t format string.
Author: Radim Kolar <hs...@sendmail.cz>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7af657e4/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 63738ff..3e3fe5c 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1368,8 +1368,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_NODE, "proxy.node.restarts.proxy.start_time", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_NODE, "proxy.node.restarts.proxy.cache_ready_time", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_NODE, "proxy.node.restarts.proxy.stop_time", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_NODE, "proxy.node.restarts.proxy.restart_count", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7af657e4/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 39bba18..d715319 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -398,10 +398,6 @@ CB_After_Cache_Init()
Debug("http_listen", "Delayed listen enable, cache initialization finished");
start_HttpProxyServer();
}
-
- time_t cache_ready_at = time(NULL);
- RecSetRecordInt("proxy.node.restarts.proxy.cache_ready_time", cache_ready_at);
-
// Alert the plugins the cache is initialized.
hook = lifecycle_hooks->get(TS_LIFECYCLE_CACHE_READY_HOOK);
while (hook) {