You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/08/30 18:21:00 UTC
[47/50] git commit: TS-2163 Remove obsolete WDA and ACC alarms feature
TS-2163 Remove obsolete WDA and ACC alarms feature
This was done for an Inktomi specific customer plugin, and no longer applies
to the project. If we later decide it necessary, we should add new APIs which
let plugins register new alarms with the system for appropriate handling.
Reading the code, it looks to me like the Alarms code was intended to be
replaced as well, so this could be part of a code refactoring/replacement.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dbbc5a27
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dbbc5a27
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dbbc5a27
Branch: refs/heads/5.0.x
Commit: dbbc5a27462e6e1c9611e48619284a97d2f1df68
Parents: bf7f7da
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Aug 30 09:12:45 2013 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Aug 30 09:14:13 2013 -0700
----------------------------------------------------------------------
lib/records/I_RecAlarms.h | 8 -----
lib/records/I_RecSignals.h | 8 -----
mgmt/Alarms.cc | 76 ++++++++--------------------------------
mgmt/Alarms.h | 10 ------
mgmt/BaseManager.h | 11 ------
mgmt/LocalManager.cc | 17 ---------
proxy/InkAPI.cc | 12 -------
proxy/api/ts/experimental.h | 17 +--------
8 files changed, 15 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/lib/records/I_RecAlarms.h
----------------------------------------------------------------------
diff --git a/lib/records/I_RecAlarms.h b/lib/records/I_RecAlarms.h
index 985c656..25bebb9 100644
--- a/lib/records/I_RecAlarms.h
+++ b/lib/records/I_RecAlarms.h
@@ -47,12 +47,4 @@
#define REC_ALARM_PROXY_HTTP_CONGESTED_SERVER 20
#define REC_ALARM_PROXY_HTTP_ALLEVIATED_SERVER 21
-#define REC_ALARM_WDA_BILLING_CONNECTION_DIED 100
-#define REC_ALARM_WDA_BILLING_CORRUPTED_DATA 101
-#define REC_ALARM_WDA_XF_ENGINE_DOWN 102
-#define REC_ALARM_WDA_RADIUS_CORRUPTED_PACKETS 103
-
-#define REC_ALARM_ACC_ALARMS_START 200
-#define REC_ALARM_ACC_ALARMS_END 299
-
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/lib/records/I_RecSignals.h
----------------------------------------------------------------------
diff --git a/lib/records/I_RecSignals.h b/lib/records/I_RecSignals.h
index 0115e56..1461c45 100644
--- a/lib/records/I_RecSignals.h
+++ b/lib/records/I_RecSignals.h
@@ -45,12 +45,4 @@
#define REC_SIGNAL_HTTP_CONGESTED_SERVER 20
#define REC_SIGNAL_HTTP_ALLEVIATED_SERVER 21
-#define REC_SIGNAL_WDA_BILLING_CONNECTION_DIED 100
-#define REC_SIGNAL_WDA_BILLING_CORRUPTED_DATA 101
-#define REC_SIGNAL_WDA_XF_ENGINE_DOWN 102
-#define REC_SIGNAL_WDA_RADIUS_CORRUPTED_PACKETS 103
-
-#define REC_SIGNAL_ACC_ALARMS_START 200
-#define REC_SIGNAL_ACC_ALARMS_END 299
-
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/mgmt/Alarms.cc
----------------------------------------------------------------------
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index 94fbbf8..c655d90 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -211,11 +211,6 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
case MGMT_ALARM_PROXY_HTTP_CONGESTED_SERVER:
case MGMT_ALARM_PROXY_HTTP_ALLEVIATED_SERVER:
return;
- case MGMT_ALARM_WDA_BILLING_CONNECTION_DIED:
- case MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA:
- case MGMT_ALARM_WDA_XF_ENGINE_DOWN:
- priority = 2;
- break;
default:
priority = 2;
break;
@@ -225,19 +220,12 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
if (desc && (priority == 1 || priority == 2) && !ip) {
if (strcmp(prev_alarm_text, desc) == 0) { /* a repeated alarm */
-
- /* INKqa11884: repeated wireless alarms always signalled */
- if (a != MGMT_ALARM_WDA_BILLING_CONNECTION_DIED &&
- a != MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA &&
- a != MGMT_ALARM_WDA_XF_ENGINE_DOWN) {
-
- time_t time_delta = time(0) - last_sent;
- if (time_delta < 900) {
- mgmt_log("[Alarms::signalAlarm] Skipping Alarm: '%s'\n", desc);
- return;
- } else {
- last_sent = time(0);
- }
+ time_t time_delta = time(0) - last_sent;
+ if (time_delta < 900) {
+ mgmt_log("[Alarms::signalAlarm] Skipping Alarm: '%s'\n", desc);
+ return;
+ } else {
+ last_sent = time(0);
}
} else {
ink_strlcpy(prev_alarm_text, desc, sizeof(prev_alarm_text));
@@ -271,18 +259,8 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
}
snprintf(buf, sizeof(buf), "%d", a);
if (ink_hash_table_lookup(local_alarms, buf, &hash_value) != 0) {
- // INKqa11884: if wireless alarm already active, just
- // update desc with new timestamp and skip to actions part
- if (a == MGMT_ALARM_WDA_BILLING_CONNECTION_DIED ||
- a == MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA ||
- a == MGMT_ALARM_WDA_XF_ENGINE_DOWN) {
- Debug("alarm", "[signalAlarm] wireless alarm already active");
- atmp = (Alarm *) hash_value;
- goto ALARM_REPEAT;
- } else {
- ink_mutex_release(&mutex);
- return;
- }
+ ink_mutex_release(&mutex);
+ return;
}
} else {
snprintf(buf, sizeof(buf), "%d-%s", a, ip);
@@ -291,18 +269,8 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
// still active
atmp = (Alarm *) hash_value;
atmp->seen = true;
-
- // INKqa11884: if wireless alarm already active, just
- // update desc with new timstamp and skip to actions part
- if (a == MGMT_ALARM_WDA_BILLING_CONNECTION_DIED ||
- a == MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA ||
- a == MGMT_ALARM_WDA_XF_ENGINE_DOWN) {
- Debug("alarm", "[Alarms::signalAlarm] wireless alarm already active");
- goto ALARM_REPEAT;
- } else {
- ink_mutex_release(&mutex);
- return;
- }
+ ink_mutex_release(&mutex);
+ return;
}
}
@@ -323,11 +291,9 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
ink_hash_table_insert(remote_alarms, (InkHashTableKey) (buf), (atmp));
}
-ALARM_REPEAT:
// Swap desc with time-stamped description. Kinda hackish
// Temporary until we get a new
// alarm system in place. TS 5.0.0, 02/08/2001
-
time_t my_time_t;
char my_ctime_str[32];
time(&my_time_t);
@@ -621,22 +587,8 @@ Alarms::execAlarmBin(const char *desc)
const char *
Alarms::getAlarmText(alarm_t id)
{
- const char *wda_conn_died = "The connection to the billing system is broken. Unable to retrieve user profile.";
- const char *wda_corr_data =
- "Could not read user profile or URL list from the billing system. The data received doesn't have the expected format.";
- const char *wda_xf_down = "The XF engine heartbeat could not be properly detected. It appears dead.";
-
- switch (id) {
- case MGMT_ALARM_WDA_BILLING_CONNECTION_DIED:
- return wda_conn_died;
- case MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA:
- return wda_corr_data;
- case MGMT_ALARM_WDA_XF_ENGINE_DOWN:
- return wda_xf_down;
- default:
- if (id < alarmTextNum)
- return alarmText[id];
- else
- return alarmText[0]; // "Unknown Alarm";
- }
+ if (id < alarmTextNum)
+ return alarmText[id];
+ else
+ return alarmText[0]; // "Unknown Alarm";
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/mgmt/Alarms.h
----------------------------------------------------------------------
diff --git a/mgmt/Alarms.h b/mgmt/Alarms.h
index a58a350..82dc282 100644
--- a/mgmt/Alarms.h
+++ b/mgmt/Alarms.h
@@ -75,18 +75,8 @@
#define MGMT_ALARM_PROXY_HTTP_ALLEVIATED_SERVER 21 /* Congestion control -- alleviated server */
#define MGMT_ALARM_PROXY_FTP_ERROR 22
-// Wireless (WDA) alarms
-#define MGMT_ALARM_WDA_BILLING_CONNECTION_DIED 100
-#define MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA 101
-#define MGMT_ALARM_WDA_XF_ENGINE_DOWN 102
-
#define MGMT_ALARM_SAC_SERVER_DOWN 400
-// ACC alarms -- 200-300 -- I tried using just one, but a bunch of 'ACL was dropped'
-// warnings didn't get to the manager UI, that's badness.
-#define MGMT_ALARM_ACC_ALARMS_START 200
-#define MGMT_ALARM_ACC_ALARMS_END 299
-
extern const char *alarmText[];
extern const int alarmTextNum;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/mgmt/BaseManager.h
----------------------------------------------------------------------
diff --git a/mgmt/BaseManager.h b/mgmt/BaseManager.h
index a8d268c..e11c7ef 100644
--- a/mgmt/BaseManager.h
+++ b/mgmt/BaseManager.h
@@ -93,17 +93,6 @@
#define MGMT_SIGNAL_HTTP_CONGESTED_SERVER 20 /* Congestion control -- congested server */
#define MGMT_SIGNAL_HTTP_ALLEVIATED_SERVER 21 /* Congestion control -- alleviated server */
-// Wireless (WDA) plugin signal
-// Warning: 1. Don't change the # mapping 'cuase 3rd party software depends on them.
-// 2. Ensure 1:1 maps with alarms in Alarm.h
-#define INK_MGMT_SIGNAL_WDA_BILLING_CONNECTION_DIED 100
-#define INK_MGMT_SIGNAL_WDA_BILLING_CORRUPTED_DATA 101
-#define INK_MGMT_SIGNAL_WDA_XF_ENGINE_DOWN 102
-#define INK_MGMT_SIGNAL_WDA_RADIUS_CORRUPTED_PACKETS 103
-
-#define INK_MGMT_SIGNAL_ACC_ALARMS_START 200
-#define INK_MGMT_SIGNAL_ACC_ALARMS_END 299
-
#define INK_MGMT_SIGNAL_SAC_SERVER_DOWN 400
typedef struct _mgmt_message_hdr_type
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/mgmt/LocalManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index 863a771..7b2799b 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -697,16 +697,6 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr * mh)
alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_HTTP_ALLEVIATED_SERVER, data_raw);
break;
// Congestion Control - end
- case INK_MGMT_SIGNAL_WDA_BILLING_CONNECTION_DIED:
- alarm_keeper->signalAlarm(MGMT_ALARM_WDA_BILLING_CONNECTION_DIED, data_raw);
- break;
- case INK_MGMT_SIGNAL_WDA_BILLING_CORRUPTED_DATA:
- alarm_keeper->signalAlarm(MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA, data_raw);
- break;
- case INK_MGMT_SIGNAL_WDA_XF_ENGINE_DOWN:
- alarm_keeper->signalAlarm(MGMT_ALARM_WDA_XF_ENGINE_DOWN, data_raw);
- break;
- // Wireless plugin signal - end
case INK_MGMT_SIGNAL_SAC_SERVER_DOWN:
alarm_keeper->signalAlarm(MGMT_ALARM_SAC_SERVER_DOWN, data_raw);
break;
@@ -714,13 +704,6 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr * mh)
default:
break;
}
-
- // #define MGMT_ALARM_ACC_ALARMS_START 200
- // #define MGMT_ALARM_ACC_ALARMS_END 299
-
- if (mh->msg_id >= INK_MGMT_SIGNAL_ACC_ALARMS_START && mh->msg_id <= INK_MGMT_SIGNAL_ACC_ALARMS_END) {
- alarm_keeper->signalAlarm(mh->msg_id, data_raw);
- }
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index b1c6416..8b51218 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -6978,18 +6978,6 @@ TSMgmtConfigIntSet(const char *var_name, TSMgmtInt value)
return TS_SUCCESS;
}
-
-/* Alarm */
-/* return type is "int" currently, it should be TSReturnCode */
-void
-TSSignalWarning(TSAlarmType code, char *msg)
-{
- sdk_assert(code >= TS_SIGNAL_WDA_BILLING_CONNECTION_DIED && code <= TS_SIGNAL_WDA_RADIUS_CORRUPTED_PACKETS);
- sdk_assert(sdk_sanity_check_null_ptr((void*)msg) == TS_SUCCESS);
-
- REC_SignalWarning(code, msg);
-}
-
void
TSICPFreshnessFuncSet(TSPluginFreshnessCalcFunc funcp)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbc5a27/proxy/api/ts/experimental.h
----------------------------------------------------------------------
diff --git a/proxy/api/ts/experimental.h b/proxy/api/ts/experimental.h
index 282bd06..9a92507 100644
--- a/proxy/api/ts/experimental.h
+++ b/proxy/api/ts/experimental.h
@@ -311,24 +311,9 @@ extern "C"
#define TS_NET_EVENT_DATAGRAM_WRITE_COMPLETE TS_EVENT_INTERNAL_208
#define TS_NET_EVENT_DATAGRAM_WRITE_ERROR TS_EVENT_INTERNAL_209
#define TS_NET_EVENT_DATAGRAM_READ_READY TS_EVENT_INTERNAL_210
-#define TS_NET_EVENT_DATAGRAM_OPEN TS_EVENT_INTERNAL_211
+#define TS_NET_EVENT_DATAGRAM_OPEN TS_EVENT_INTERNAL_211
#define TS_NET_EVENT_DATAGRAM_ERROR TS_EVENT_INTERNAL_212
- typedef enum
- {
- TS_SIGNAL_WDA_BILLING_CONNECTION_DIED = 100,
- TS_SIGNAL_WDA_BILLING_CORRUPTED_DATA = 101,
- TS_SIGNAL_WDA_XF_ENGINE_DOWN = 102,
- TS_SIGNAL_WDA_RADIUS_CORRUPTED_PACKETS = 103
- } TSAlarmType;
-
- /* ===== Alarm ===== */
- /****************************************************************************
- * ??
- * contact: OXYGEN
- ****************************************************************************/
- tsapi void TSSignalWarning(TSAlarmType code, char *msg);
-
/*****************************************************************************
* Cluster RPC API support *
*****************************************************************************/