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/21 09:44:29 UTC
svn commit: r1137894 - in /trafficserver/traffic/trunk: CHANGES
build/network.m4 configure.ac lib/ts/ink_config.h.in mgmt/Main.cc
mgmt/RecordsConfig.cc proxy/config/records.config.default.in
Author: zym
Date: Tue Jun 21 07:44:29 2011
New Revision: 1137894
URL: http://svn.apache.org/viewvc?rev=1137894&view=rev
Log:
[TS-845] make proxy.config.cluster.ethernet_interface default to lo/lo0
lo on linux and lo0 on bsd derivatives. it does no effect when you
really want to setup the cluster type=1, in that case you will need
to change the interface to a real interface like eth0. this patch
will just make it is safe to remove the whole cluster config block
from records.config if you like, and don't drive the newbie crazy
when they copy the records.config to another system where there is
no eth0 but bonding0.
we may need to rework the whole ClusterComunication system initialize
when we have someone cleanup the mgmt/web2(the webui).
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/build/network.m4
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/lib/ts/ink_config.h.in
trafficserver/traffic/trunk/mgmt/Main.cc
trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/config/records.config.default.in
Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1137894&r1=1137893&r2=1137894&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Tue Jun 21 07:44:29 2011
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.0
+ *) [TS-845] make proxy.config.cluster.ethernet_interface default to
+ loopback interface: lo on linux and lo0 on bsd derivatives
+
*) [TS-847] Bad timeout when using CONNECT method.
*) [TS-826] TSHttpTxnErrorBodySet() can leak memory. Author: William
Modified: trafficserver/traffic/trunk/build/network.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/network.m4?rev=1137894&r1=1137893&r2=1137894&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/network.m4 (original)
+++ trafficserver/traffic/trunk/build/network.m4 Tue Jun 21 07:44:29 2011
@@ -95,25 +95,20 @@ AC_SUBST(gethostbyname_r_hostent_data)
])
dnl
-dnl TS_CHECK_DEFAULT_IFACE: try to figure out default network interface
+dnl TS_CHECK_LOOPBACK_IFACE: try to figure out default loopback interface
dnl
-AC_DEFUN([TS_CHECK_DEFAULT_IFACE], [
-default_net_iface=""
-AC_MSG_CHECKING([for default network interface])
+AC_DEFUN([TS_CHECK_LOOPBACK_IFACE], [
+default_loopback_iface=""
+AC_MSG_CHECKING([for loopback network interface])
case $host_os in
linux*)
- default_net_iface=[`/sbin/ifconfig | sed 's/^ *$/CRLF/g' | tr '\n' ' ' | sed 's/CRLF /\n/g' | grep -v LOOPBACK | grep 'UP.*RUNNING' | head -1 | awk '{ n=1; print $n; }' 2>/dev/null`]
+ default_loopback_iface=lo
;;
darwin* | freebsd* | solaris*)
- default_net_iface=[`/sbin/ifconfig -a | grep 'UP.*RUNNING' | grep -v LOOPBACK | head -1 | awk -F: '{ n=1; print $n; }'`]
+ default_loopback_iface=lo0
;;
esac
-if test "x$default_net_iface" = "x"; then
- AC_MSG_RESULT([not found. Using default eth0])
- default_net_iface=eth0
-else
- AC_MSG_RESULT([$default_net_iface])
-fi
-AC_SUBST([default_net_iface])
+AC_MSG_RESULT([$default_loopback_iface])
+AC_SUBST([default_loopback_iface])
])
dnl
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1137894&r1=1137893&r2=1137894&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Tue Jun 21 07:44:29 2011
@@ -1168,7 +1168,7 @@ AS_IF([test "x$enable_tproxy" != "xno"],
AC_SUBST(use_tproxy)
AC_SUBST(ip_transparent)
-TS_CHECK_DEFAULT_IFACE
+TS_CHECK_LOOPBACK_IFACE
TS_CHECK_GETHOSTBYNAME_R_STYLE
#
Modified: trafficserver/traffic/trunk/lib/ts/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_config.h.in?rev=1137894&r1=1137893&r2=1137894&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_config.h.in Tue Jun 21 07:44:29 2011
@@ -186,4 +186,6 @@
#define TS_BUILD_CACHEDIR "@rel_cachedir@"
#define TS_BUILD_INFODIR "@rel_infodir@"
+#define TS_BUILD_DEFAULT_LOOPBACK_IFACE "@default_loopback_iface@"
+
#endif /* _ink_config_h */
Modified: trafficserver/traffic/trunk/mgmt/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/Main.cc?rev=1137894&r1=1137893&r2=1137894&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/Main.cc (original)
+++ trafficserver/traffic/trunk/mgmt/Main.cc Tue Jun 21 07:44:29 2011
@@ -808,6 +808,7 @@ main(int argc, char **argv)
group_addr, "224.0.1.0 - 239.255.255.255");
}
+ /* TODO: Do we really need to init cluster communication? */
lmgmt->initCCom(cluster_port, group_addr, cluster_server_port); /* Setup cluster communication */
lmgmt->initMgmtProcessServer(); /* Setup p-to-p process server */
Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1137894&r1=1137893&r2=1137894&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Tue Jun 21 07:44:29 2011
@@ -876,7 +876,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.cluster.cluster_configuration", RECD_STRING, "cluster.config", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.cluster.ethernet_interface", RECD_STRING, NULL, RECU_RESTART_TS, RR_REQUIRED, RECC_STR, "^[^[:space:]]*$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.cluster.ethernet_interface", RECD_STRING, TS_BUILD_DEFAULT_LOOPBACK_IFACE, RECU_RESTART_TS, RR_REQUIRED, RECC_STR, "^[^[:space:]]*$", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.cluster.enable_monitor", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
Modified: trafficserver/traffic/trunk/proxy/config/records.config.default.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.default.in?rev=1137894&r1=1137893&r2=1137894&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.default.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.default.in Tue Jun 21 07:44:29 2011
@@ -300,7 +300,7 @@ CONFIG proxy.config.cluster.mcport INT 8
CONFIG proxy.config.cluster.mc_group_addr STRING 224.0.1.37
CONFIG proxy.config.cluster.mc_ttl INT 1
CONFIG proxy.config.cluster.log_bogus_mc_msgs INT 1
-CONFIG proxy.config.cluster.ethernet_interface STRING @default_net_iface@
+CONFIG proxy.config.cluster.ethernet_interface STRING @default_loopback_iface@
##############################################################################
#
# Cache