trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject [2/3] trafficserver git commit: TS-3178: Maintain backwards compatability with old config.
Date Wed, 12 Nov 2014 01:01:11 GMT
TS-3178: Maintain backwards compatability with old config.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5b9bd5dc
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5b9bd5dc
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5b9bd5dc

Branch: refs/heads/master
Commit: 5b9bd5dc7ef4c17245e0e49dd51518d42a963af5
Parents: a8cb810
Author: Brian Geffon <briang@apache.org>
Authored: Tue Nov 11 16:59:56 2014 -0800
Committer: Brian Geffon <briang@apache.org>
Committed: Tue Nov 11 16:59:56 2014 -0800

----------------------------------------------------------------------
 doc/reference/configuration/records.config.en.rst | 2 +-
 iocore/eventsystem/EventSystem.cc                 | 3 ++-
 mgmt/RecordsConfig.cc                             | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5b9bd5dc/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index f4e5c97..a69b7dd 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -2513,7 +2513,7 @@ Sockets
    Specifies the number of task threads to run. These threads are used for
    various tasks that should be off-loaded from the normal network threads.
 
-.. ts:cv:: CONFIG proxy.config.allocator.thread_freelist_high_watermark INT 512
+.. ts:cv:: CONFIG proxy.config.allocator.thread_freelist_size INT 512
 
    Sets the maximum number of elements that can be contained in a ProxyAllocator (per-thread)
    before returning the objects to the global pool

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5b9bd5dc/iocore/eventsystem/EventSystem.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/EventSystem.cc b/iocore/eventsystem/EventSystem.cc
index 853f5e5..4d61f39 100644
--- a/iocore/eventsystem/EventSystem.cc
+++ b/iocore/eventsystem/EventSystem.cc
@@ -37,8 +37,9 @@ ink_event_system_init(ModuleVersion v)
   int config_max_iobuffer_size = DEFAULT_MAX_BUFFER_SIZE;
 
   // For backwards compatability make sure to allow thread_freelist_size
+  // This needs to change in 6.0
   REC_EstablishStaticConfigInt32(thread_freelist_high_watermark, "proxy.config.allocator.thread_freelist_size");
-  REC_EstablishStaticConfigInt32(thread_freelist_high_watermark, "proxy.config.allocator.thread_freelist_high_watermark");
+
   REC_EstablishStaticConfigInt32(thread_freelist_low_watermark, "proxy.config.allocator.thread_freelist_low_watermark");
 
   REC_ReadConfigInteger(config_max_iobuffer_size, "proxy.config.io.max_buffer_size");

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5b9bd5dc/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 10a1da1..9d3c070 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -2033,10 +2033,9 @@ RecordElement RecordsConfig[] = {
   //# Per-thread freelist / allocator controls
   //#
   //############
+  /* this should be renamed in 6.0 */
   {RECT_CONFIG, "proxy.config.allocator.thread_freelist_size", RECD_INT, "512", RECU_NULL,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.allocator.thread_freelist_high_watermark", RECD_INT, "512",
RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
-  ,
   {RECT_CONFIG, "proxy.config.allocator.thread_freelist_low_watermark", RECD_INT, "32", RECU_NULL,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
 


Mime
View raw message