You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zy...@apache.org on 2011/06/24 06:35:53 UTC
svn commit: r1139153 - in /trafficserver/traffic/trunk: CHANGES
contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
iocore/cluster/ClusterProcessor.cc iocore/cluster/P_ClusterCache.h
mgmt/RecordsConfig.cc proxy/Main.cc
Author: zym
Date: Fri Jun 24 04:35:53 2011
New Revision: 1139153
URL: http://svn.apache.org/viewvc?rev=1139153&view=rev
Log:
[TS-822] make cluster thread number configable
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc
trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/Main.cc
Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1139153&r1=1139152&r2=1139153&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Fri Jun 24 04:35:53 2011
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.0
+ *) [TS-822] make cluster thread number configable
+
*) [TS-845] make proxy.config.cluster.ethernet_interface default to
loopback interface: lo on linux and lo0 on bsd derivatives
Modified: trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1139153&r1=1139152&r2=1139153&view=diff
==============================================================================
--- trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm (original)
+++ trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm Fri Jun 24 04:35:53 2011
@@ -339,6 +339,7 @@ The Apache Traffic Server Administration
proxy.config.cluster.send_buffer_size
proxy.config.cluster.sock_option_flag
proxy.config.cluster.startup_timeout
+ proxy.config.cluster.threads
proxy.config.config_dir
proxy.config.cop.core_signal
proxy.config.cop.linux_min_memfree_kb
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc?rev=1139153&r1=1139152&r2=1139153&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc Fri Jun 24 04:35:53 2011
@@ -33,6 +33,7 @@
/*************************************************************************/
int cluster_port_number = DEFAULT_CLUSTER_PORT_NUMBER;
int cache_clustering_enabled = 0;
+int num_of_cluster_threads = DEFAULT_NUMBER_OF_CLUSTER_THREADS;
ClusterProcessor clusterProcessor;
RecRawStatBlock *cluster_rsb = NULL;
@@ -667,6 +668,8 @@ ClusterProcessor::init()
else {
IOCORE_ReadConfigInteger(cluster_port, "proxy.config.cluster.cluster_port");
}
+ if (num_of_cluster_threads == DEFAULT_NUMBER_OF_CLUSTER_THREADS)
+ IOCORE_ReadConfigInteger(num_of_cluster_threads, "proxy.config.cluster.threads");
IOCORE_EstablishStaticConfigInt32(CacheClusterMonitorEnabled, "proxy.config.cluster.enable_monitor");
IOCORE_EstablishStaticConfigInt32(CacheClusterMonitorIntervalSecs, "proxy.config.cluster.monitor_interval_secs");
@@ -723,7 +726,7 @@ ClusterProcessor::start()
#endif
if (cache_clustering_enabled && (cacheProcessor.IsCacheEnabled() == CACHE_INITIALIZED)) {
- ET_CLUSTER = eventProcessor.spawn_event_threads(1, "ET_CLUSTER");
+ ET_CLUSTER = eventProcessor.spawn_event_threads(num_of_cluster_threads, "ET_CLUSTER");
for (int i = 0; i < eventProcessor.n_threads_for_type[ET_CLUSTER]; i++) {
initialize_thread_for_net(eventProcessor.eventthread[ET_CLUSTER][i], i);
}
Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h?rev=1139153&r1=1139152&r2=1139153&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h Fri Jun 24 04:35:53 2011
@@ -71,6 +71,7 @@
#define DEFAULT_CLUSTER_PORT_NUMBER 0
+#define DEFAULT_NUMBER_OF_CLUSTER_THREADS 1
#define DEFAULT_CLUSTER_HOST ""
#define MAX_CLUSTER_SEND_LENGTH INT_MAX
Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1139153&r1=1139152&r2=1139153&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Fri Jun 24 04:35:53 2011
@@ -872,6 +872,8 @@ RecordElement RecordsConfig[] = {
//# Cluster Subsystem
//#
//##############################################################################
+ {RECT_CONFIG, "proxy.config.cluster.threads", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-512]", RECA_NULL}
+ ,
{RECT_CONFIG, "proxy.config.cluster.cluster_port", RECD_INT, "8086", RECU_RESTART_TS, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.cluster.cluster_configuration", RECD_STRING, "cluster.config", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1139153&r1=1139152&r2=1139153&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Fri Jun 24 04:35:53 2011
@@ -102,7 +102,6 @@ extern "C" int plock(int);
//
#define DEFAULT_NUMBER_OF_THREADS ink_number_of_processors()
#define DEFAULT_NUMBER_OF_UDP_THREADS 1
-#define DEFAULT_NUMBER_OF_CLUSTER_THREADS 1
#define DEFAULT_NUMBER_OF_SSL_THREADS 0
#define DEFAULT_NUM_ACCEPT_THREADS 0
#define DEFAULT_NUM_TASK_THREADS 0
@@ -127,7 +126,7 @@ int stack_trace_flag = DEFAULT_STACK_TRA
int number_of_processors = ink_number_of_processors();
int num_of_net_threads = DEFAULT_NUMBER_OF_THREADS;
-int num_of_cluster_threads = DEFAULT_NUMBER_OF_CLUSTER_THREADS;
+extern int num_of_cluster_threads;
int num_of_udp_threads = DEFAULT_NUMBER_OF_UDP_THREADS;
int num_accept_threads = DEFAULT_NUM_ACCEPT_THREADS;
int num_task_threads = DEFAULT_NUM_TASK_THREADS;