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 2013/10/31 11:48:35 UTC
git commit: TS-2277: cluster alarm messages broadcast infinitely
Updated Branches:
refs/heads/master 316b45041 -> 26e1417a9
TS-2277: cluster alarm messages broadcast infinitely
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/26e1417a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/26e1417a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/26e1417a
Branch: refs/heads/master
Commit: 26e1417a94ded811b60dbde91358ccf51e58c460
Parents: 316b450
Author: Yu Qing <zh...@taobao.com>
Authored: Thu Oct 17 17:13:14 2013 +0800
Committer: Zhao Yongming <mi...@gmail.com>
Committed: Thu Oct 31 18:47:40 2013 +0800
----------------------------------------------------------------------
CHANGES | 3 +++
mgmt/cluster/ClusterCom.cc | 7 +++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/26e1417a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index fb18b34..f6aed0e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
Changes with Apache Traffic Server 4.1.0
+ *) [TS-2277] cluster alarm messages broadcast infinitely.
+ Author: Yu Qing
+
*) [TS-2276] manager memory leak in some case.
Author: Yu Qing
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/26e1417a/mgmt/cluster/ClusterCom.cc
----------------------------------------------------------------------
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index 9be52eb..2625655 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -647,8 +647,11 @@ ClusterCom::checkPeers(time_t * ticker)
delete buff;
ink_mutex_release(&(mutex)); /* Release cluster lock */
if (signal_alarm) {
+ /*
lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR,
"[TrafficManager] Unable to write cluster.config, membership unchanged");
+ */
+ mgmt_elog(0, "[TrafficManager] Unable to write cluster.config, membership unchanged");
}
*ticker = t;
}
@@ -795,9 +798,11 @@ ClusterCom::handleMultiCastMessage(char *message)
if ((line = strtok_r(NULL, "\n", &last)) == NULL)
goto Lbogus; /* OS of sender */
if (!strstr(line, "os: ") || !strstr(line, sys_name)) {
+ /*
lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR,
"Received Multicast message from peer running mis-match"
" Operating system, please investigate");
+ */
Debug("ccom", "[ClusterCom::handleMultiCastMessage] Received message from peer "
"running different os/release '%s'(ours os: '%s' rel: '%s'\n", line, sys_name, sys_release);
}
@@ -805,9 +810,11 @@ ClusterCom::handleMultiCastMessage(char *message)
if ((line = strtok_r(NULL, "\n", &last)) == NULL)
goto Lbogus; /* OS-Version of sender */
if (!strstr(line, "rel: ") || !strstr(line, sys_release)) {
+ /*
lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR,
"Received Multicast message from peer running mis-match"
" Operating system release, please investigate");
+ */
Debug("ccom", "[ClusterCom::handleMultiCastMessage] Received message from peer "
"running different os/release '%s'(ours os: '%s' rel: '%s'\n", line, sys_name, sys_release);
}
Re: git commit: TS-2277: cluster alarm messages broadcast
infinitely
Posted by Igor Galić <i....@brainsware.org>.
I was just about to ask the same.
----- Original Message -----
> On Oct 31, 2013, at 4:48 AM, zym@apache.org wrote:
>
> > + /*
> > lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR,
> > "[TrafficManager] Unable to write
> > cluster.config, membership
> > unchanged");
> > + */
>
>
> If this is dead code, why leave it? Or if we’re uncertain, at least add a
> comment as to why the code is left commented out? Same with the rest of the
> patch.
>
> — Leif
>
>
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
Re: git commit: TS-2277: cluster alarm messages broadcast infinitely
Posted by Leif Hedstrom <zw...@apache.org>.
On Oct 31, 2013, at 4:48 AM, zym@apache.org wrote:
> + /*
> lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR,
> "[TrafficManager] Unable to write cluster.config, membership unchanged");
> + */
If this is dead code, why leave it? Or if we’re uncertain, at least add a comment as to why the code is left commented out? Same with the rest of the patch.
— Leif
Re: git commit: TS-2277: cluster alarm messages broadcast infinitely
Posted by Leif Hedstrom <zw...@apache.org>.
On Oct 31, 2013, at 4:48 AM, zym@apache.org wrote:
> + /*
> lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR,
> "[TrafficManager] Unable to write cluster.config, membership unchanged");
> + */
If this is dead code, why leave it? Or if we’re uncertain, at least add a comment as to why the code is left commented out? Same with the rest of the patch.
— Leif