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 2013/07/22 17:51:35 UTC
[1/2] git commit: TS-1943: Make variable name of mcport/rsport more
readable
Updated Branches:
refs/heads/master b16a3ac1f -> 4e77a47a0
TS-1943: Make variable name of mcport/rsport more readable
I was confused by the variable name of "proxy.config.cluster.mcport":
cluster_port, which could be mistaken for "proxy.config.cluster.cluster_port".
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b7ae7430
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b7ae7430
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b7ae7430
Branch: refs/heads/master
Commit: b7ae743002c23413d7bfc3bc3f8aeaa3d8a232e0
Parents: b16a3ac
Author: Yunkai Zhang <qi...@taobao.com>
Authored: Mon Jul 22 08:33:52 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Jul 22 08:33:52 2013 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
mgmt/LocalManager.cc | 4 ++--
mgmt/LocalManager.h | 2 +-
mgmt/Main.cc | 24 ++++++++++++------------
mgmt/cluster/ClusterCom.cc | 6 +++---
mgmt/cluster/ClusterCom.h | 2 +-
6 files changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7ae7430/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0a35ff5..218af33 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
Changes with Apache Traffic Server 3.3.5
+ *) [TS-1943] Rename mcport and rsport parameters to make them more readable.
+ uthor: Yunkai Zhang <qi...@taobao.com>
+
*) [TS-2046] Move perl contribs to lib/perl, and have make / make install
build and install the modules as appropriate.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7ae7430/mgmt/LocalManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index 3081555..e8640ed 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -321,7 +321,7 @@ LocalManager::initAlarm()
* Function initializes cluster communication structure held by local manager.
*/
void
-LocalManager::initCCom(int port, char *addr, int sport)
+LocalManager::initCCom(int mcport, char *addr, int rsport)
{
bool found;
IpEndpoint cluster_ip; // ip addr of the cluster interface
@@ -368,7 +368,7 @@ LocalManager::initCCom(int port, char *addr, int sport)
ink_strlcat(envBuf, clusterAddrStr, envBuf_size);
ink_release_assert(putenv(envBuf) == 0);
- ccom = new ClusterCom(ats_ip4_addr_cast(&cluster_ip), hostname, port, addr, sport, pserver_path);
+ ccom = new ClusterCom(ats_ip4_addr_cast(&cluster_ip), hostname, mcport, addr, rsport, pserver_path);
virt_map = new VMap(intrName, ats_ip4_addr_cast(&cluster_ip), &lmgmt->ccom->mutex);
virt_map->downAddrs(); // Just to be safe
ccom->establishChannels();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7ae7430/mgmt/LocalManager.h
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.h b/mgmt/LocalManager.h
index 8df0640..7b677d8 100644
--- a/mgmt/LocalManager.h
+++ b/mgmt/LocalManager.h
@@ -67,7 +67,7 @@ public:
};
void initAlarm();
- void initCCom(int port, char *addr, int sport);
+ void initCCom(int mcport, char *addr, int rsport);
void initMgmtProcessServer();
void pollMgmtProcessServer();
void handleMgmtMsgFromProcesses(MgmtMessageHdr * mh);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7ae7430/mgmt/Main.cc
----------------------------------------------------------------------
diff --git a/mgmt/Main.cc b/mgmt/Main.cc
index 9b685bb..b9abfea 100644
--- a/mgmt/Main.cc
+++ b/mgmt/Main.cc
@@ -391,7 +391,7 @@ main(int argc, char **argv)
bool found = false;
int just_started = 0;
- int cluster_port = -1, cluster_server_port = -1;
+ int cluster_mcport = -1, cluster_rsport = -1;
// TODO: This seems completely incomplete, disabled for now
// int dump_config = 0, dump_process = 0, dump_node = 0, dump_cluster = 0, dump_local = 0;
char* proxy_port = 0;
@@ -414,12 +414,12 @@ main(int argc, char **argv)
aconf_port_arg = atoi(envVar);
}
- if ((envVar = getenv("MGMT_CLUSTER_PORT")) != NULL) {
- cluster_port = atoi(envVar);
+ if ((envVar = getenv("MGMT_CLUSTER_MC_PORT")) != NULL) {
+ cluster_mcport = atoi(envVar);
}
if ((envVar = getenv("MGMT_CLUSTER_RS_PORT")) != NULL) {
- cluster_server_port = atoi(envVar);
+ cluster_rsport = atoi(envVar);
}
if ((envVar = getenv("MGMT_GROUP_ADDR")) != NULL) {
@@ -443,15 +443,15 @@ main(int argc, char **argv)
if (strcmp(argv[i], "-aconfPort") == 0) {
++i;
aconf_port_arg = atoi(argv[i]);
- } else if (strcmp(argv[i], "-clusterPort") == 0) {
+ } else if (strcmp(argv[i], "-clusterMCPort") == 0) {
++i;
- cluster_port = atoi(argv[i]);
+ cluster_mcport = atoi(argv[i]);
} else if (strcmp(argv[i], "-groupAddr") == 0) {
++i;
group_addr = argv[i];
} else if (strcmp(argv[i], "-clusterRSPort") == 0) {
++i;
- cluster_server_port = atoi(argv[i]);
+ cluster_rsport = atoi(argv[i]);
#if TS_USE_DIAGS
} else if (strcmp(argv[i], "-debug") == 0) {
++i;
@@ -680,13 +680,13 @@ main(int argc, char **argv)
RecSetRecordInt("proxy.config.process_manager.mgmt_port", proxy_backdoor);
}
- if (cluster_server_port == -1) {
- cluster_server_port = REC_readInteger("proxy.config.cluster.rsport", &found);
+ if (cluster_rsport == -1) {
+ cluster_rsport = REC_readInteger("proxy.config.cluster.rsport", &found);
ink_assert(found);
}
- if (cluster_port == -1) {
- cluster_port = REC_readInteger("proxy.config.cluster.mcport", &found);
+ if (cluster_mcport == -1) {
+ cluster_mcport = REC_readInteger("proxy.config.cluster.mcport", &found);
ink_assert(found);
}
@@ -713,7 +713,7 @@ main(int argc, char **argv)
}
/* TODO: Do we really need to init cluster communication? */
- lmgmt->initCCom(cluster_port, group_addr, cluster_server_port); /* Setup cluster communication */
+ lmgmt->initCCom(cluster_mcport, group_addr, cluster_rsport); /* Setup cluster communication */
lmgmt->initMgmtProcessServer(); /* Setup p-to-p process server */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7ae7430/mgmt/cluster/ClusterCom.cc
----------------------------------------------------------------------
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index db75541..2fedee5 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -327,7 +327,7 @@ cluster_com_port_watcher(const char *name, RecDataT /* data_type ATS_UNUSED */,
} /* End cluster_com_port_watcher */
-ClusterCom::ClusterCom(unsigned long oip, char *host, int port, char *group, int sport, char *p)
+ClusterCom::ClusterCom(unsigned long oip, char *host, int mcport, char *group, int rsport, char *p)
: our_wall_clock(0), alive_peers_count(0), reliable_server_fd(0), broadcast_fd(0), receive_fd(0)
{
int rec_err;
@@ -406,8 +406,8 @@ ClusterCom::ClusterCom(unsigned long oip, char *host, int port, char *group, int
}
ink_strlcpy(mc_group, group, sizeof(mc_group));
- mc_port = port;
- reliable_server_port = sport;
+ mc_port = mcport;
+ reliable_server_port = rsport;
mc_ttl = REC_readInteger("proxy.config.cluster.mc_ttl", &found);
ink_assert(found);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7ae7430/mgmt/cluster/ClusterCom.h
----------------------------------------------------------------------
diff --git a/mgmt/cluster/ClusterCom.h b/mgmt/cluster/ClusterCom.h
index 448136d..39b10f3 100644
--- a/mgmt/cluster/ClusterCom.h
+++ b/mgmt/cluster/ClusterCom.h
@@ -94,7 +94,7 @@ class ClusterCom
{
public:
- ClusterCom(unsigned long oip, char *hname, int port, char *group, int sport, char *p);
+ ClusterCom(unsigned long oip, char *hname, int mcport, char *group, int rsport, char *p);
~ClusterCom()
{
};
[2/2] git commit: TS-1943: update traffic_manager documentation
Posted by jp...@apache.org.
TS-1943: update traffic_manager documentation
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4e77a47a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4e77a47a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4e77a47a
Branch: refs/heads/master
Commit: 4e77a47a0bdd876bd205ad1a81a1eb680ef85151
Parents: b7ae743
Author: James Peach <jp...@apache.org>
Authored: Mon Jul 22 08:37:20 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Jul 22 08:37:20 2013 -0700
----------------------------------------------------------------------
doc/admin/commands/traffic_manager.en.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4e77a47a/doc/admin/commands/traffic_manager.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/commands/traffic_manager.en.rst b/doc/admin/commands/traffic_manager.en.rst
index 2a82fcd..f602b2a 100644
--- a/doc/admin/commands/traffic_manager.en.rst
+++ b/doc/admin/commands/traffic_manager.en.rst
@@ -27,7 +27,7 @@ Description
.. option:: proxyOff
.. option:: -nosyslog
.. option:: -aconfPort PORT
-.. option:: -clusterPort PORT
+.. option:: -clusterMCPort PORT
.. option:: -groupAddr ADDRESS
.. option:: -clusterRSPort PORT
.. option:: -debug TAGS
@@ -44,7 +44,7 @@ Environment
===========
.. envvar:: MGMT_ACONF_PORT
-.. envvar:: MGMT_CLUSTER_PORT
+.. envvar:: MGMT_CLUSTER_MC_PORT
.. envvar:: MGMT_CLUSTER_RS_PORT
.. envvar:: MGMT_GROUP_ADDR