You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2015/04/12 21:54:44 UTC
[1/2] trafficserver git commit: TS-3489: Not able to set more than 1
accept thread per port and cleaned up more thread configuration ranges
Repository: trafficserver
Updated Branches:
refs/heads/master d0d30f8be -> 9733333ba
TS-3489: Not able to set more than 1 accept thread per port
and cleaned up more thread configuration ranges
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1a7c10d3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1a7c10d3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1a7c10d3
Branch: refs/heads/master
Commit: 1a7c10d3e9163d7f2a5ad799c084cf8e7261a163
Parents: d0d30f8
Author: Bryan Call <bc...@apache.org>
Authored: Sun Apr 12 14:27:39 2015 -0500
Committer: Bryan Call <bc...@apache.org>
Committed: Sun Apr 12 14:52:14 2015 -0500
----------------------------------------------------------------------
lib/ts/ink_config.h.in | 4 ++++
mgmt/RecordsConfig.cc | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a7c10d3/lib/ts/ink_config.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index da2fa17..0d51b4e 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -38,6 +38,10 @@
*/
#include "ink_autoconf.h"
+// Helper macro to convert integer defines into string literals
+#define _TS_STR(x) #x
+#define TS_STR(x) _TS_STR(x)
+
#define BUILD_MACHINE "@build_machine@"
#define BUILD_PERSON "@build_person@"
#define BUILD_GROUP "@build_group@"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1a7c10d3/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index bebe224..cf5f4c1 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -111,17 +111,17 @@ static const RecordElement RecordsConfig[] =
,
// Traffic Server Execution threads configuration
// By default Traffic Server set number of execution threads equal to total CPUs
- {RECT_CONFIG, "proxy.config.exec_thread.autoconfig", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-65535]", RECA_READ_ONLY}
+ {RECT_CONFIG, "proxy.config.exec_thread.autoconfig", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_READ_ONLY}
,
{RECT_CONFIG, "proxy.config.exec_thread.autoconfig.scale", RECD_FLOAT, "1.5", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_READ_ONLY}
,
- {RECT_CONFIG, "proxy.config.exec_thread.limit", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_INT, "[1-1024]", RECA_READ_ONLY}
+ {RECT_CONFIG, "proxy.config.exec_thread.limit", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_INT, "[1-" TS_STR(TS_MAX_NUMBER_EVENT_THREADS) "]", RECA_READ_ONLY}
,
{RECT_CONFIG, "proxy.config.exec_thread.affinity", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-4]", RECA_READ_ONLY}
,
- {RECT_CONFIG, "proxy.config.accept_threads", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_READ_ONLY}
+ {RECT_CONFIG, "proxy.config.accept_threads", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-" TS_STR(TS_MAX_NUMBER_EVENT_THREADS) "]", RECA_READ_ONLY}
,
- {RECT_CONFIG, "proxy.config.task_threads", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-99999]", RECA_READ_ONLY}
+ {RECT_CONFIG, "proxy.config.task_threads", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-" TS_STR(TS_MAX_NUMBER_EVENT_THREADS) "]", RECA_READ_ONLY}
,
{RECT_CONFIG, "proxy.config.thread.default.stacksize", RECD_INT, "1048576", RECU_RESTART_TS, RR_NULL, RECC_INT, "[131072-104857600]", RECA_READ_ONLY}
,
[2/2] trafficserver git commit: TS-3489: updated CHANGES and fixed
formatting
Posted by bc...@apache.org.
TS-3489: updated CHANGES and fixed formatting
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9733333b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9733333b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9733333b
Branch: refs/heads/master
Commit: 9733333bacf8e18da80c900da80e8df4bc037f5c
Parents: 1a7c10d
Author: Bryan Call <bc...@apache.org>
Authored: Sun Apr 12 14:54:02 2015 -0500
Committer: Bryan Call <bc...@apache.org>
Committed: Sun Apr 12 14:54:02 2015 -0500
----------------------------------------------------------------------
CHANGES | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9733333b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 336e4cb..681080e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,16 +1,19 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3489] Not able to set more than 1 accept thread per port and cleaned
+ other thread configurable ranges
+
*) [TS-3516] Fix various compile warnings with latest versions of clang.
- *) [TS-3438]: Assert if npn protocol is invalid (empty string)
+ *) [TS-3438] Assert if npn protocol is invalid (empty string)
- *) [TS-3501]: Support configuring socket options for client sockets
+ *) [TS-3501] Support configuring socket options for client sockets
*) [TS-3515] Use pcrejit (Regex class) for regex_map
*) [TS-3500] Fix TSHttpTxnPristineUrlGet to return client request's url
- when pristine url is not populated
+ when pristine url is not populated
*) [TS-3514] Atomic check for gcc >4.1 breaks with gcc 5.0
Author: Marcin Juszkiewicz <mj...@redhat.com>
@@ -21,17 +24,17 @@ Changes with Apache Traffic Server 6.0.0
Author: Ryo Okubo <ro...@yahoo-corp.jp>.
*) [TS-3504] Only read "proxy.config.cache.ram_cache.use_seen_filter" once.
- Do not set up a callback.
+ Do not set up a callback.
*) [TS-3503] Add ua_first_read to milestones to track when the first byte
- was read from the client.
+ was read from the client.
*) [TS-3450]: rename header_rewrite condition INTERNAL-TRANSACTION as
- INTERNAL-TXN in-line with the changes in [TS-3449].
+ INTERNAL-TXN in-line with the changes in [TS-3449].
*) [TS-3449]: Deprecate TSHttpIsInternalRequest and TSHttpIsInternalSession
- and replace them with TSHttpTxnIsInternal, TSHttpSsnIsInternal
- respectively.
+ and replace them with TSHttpTxnIsInternal, TSHttpSsnIsInternal
+ respectively.
*) [TS-3475] Add a few records.config options for controlling the HTTP/2
SETTINGS. Thanks to Masakazu for all the reviews and additions.