trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [trafficserver] 01/03: Removes alarms that no longer are supported
Date Thu, 16 May 2019 02:03:02 GMT
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 5c672b1796d5eb5eef3197a697a1382f72454a1a
Author: Leif Hedstrom <zwoop@apache.org>
AuthorDate: Thu May 9 16:39:36 2019 -0600

    Removes alarms that no longer are supported
---
 doc/developer-guide/api/types/TSMgmtTypes.en.rst | 12 +----
 lib/records/I_RecAlarms.h                        | 16 +++----
 lib/records/I_RecSignals.h                       | 17 +++----
 mgmt/Alarms.cc                                   | 56 ++++++++----------------
 mgmt/Alarms.h                                    | 30 ++++---------
 mgmt/BaseManager.h                               | 14 +++---
 mgmt/LocalManager.cc                             | 32 --------------
 mgmt/api/CoreAPIShared.cc                        | 33 --------------
 mgmt/api/CoreAPIShared.h                         | 14 +++---
 mgmt/api/include/mgmtapi.h                       |  9 ----
 src/traffic_manager/traffic_manager.cc           |  6 +--
 11 files changed, 59 insertions(+), 180 deletions(-)

diff --git a/doc/developer-guide/api/types/TSMgmtTypes.en.rst b/doc/developer-guide/api/types/TSMgmtTypes.en.rst
index 6d53d22..435fe95 100644
--- a/doc/developer-guide/api/types/TSMgmtTypes.en.rst
+++ b/doc/developer-guide/api/types/TSMgmtTypes.en.rst
@@ -30,16 +30,10 @@ Management Signals
 
 .. c:macro:: MGMT_SIGNAL_PID
 
-.. c:macro:: MGMT_SIGNAL_MACHINE_UP
-
-.. c:macro:: MGMT_SIGNAL_MACHINE_DOWN
-
 .. c:macro:: MGMT_SIGNAL_CONFIG_ERROR
 
 .. c:macro:: MGMT_SIGNAL_SYSTEM_ERROR
 
-.. c:macro:: MGMT_SIGNAL_LOG_SPACE_CRISIS
-
 .. c:macro:: MGMT_SIGNAL_CONFIG_FILE_READ
 
 .. c:macro:: MGMT_SIGNAL_CACHE_ERROR
@@ -52,8 +46,6 @@ Management Signals
 
 .. c:macro:: MGMT_SIGNAL_PLUGIN_SET_CONFIG
 
-.. c:macro:: MGMT_SIGNAL_LOG_FILES_ROLLED
-
 .. c:macro:: MGMT_SIGNAL_LIBRECORDS
 
 .. c:macro:: MGMT_SIGNAL_HTTP_CONGESTED_SERVER
@@ -62,8 +54,6 @@ Management Signals
 
 .. c:macro:: MGMT_SIGNAL_CONFIG_FILE_CHILD
 
-.. c:macro:: MGMT_SIGNAL_SAC_SERVER_DOWN
-
 
 Management Events
 ==================
@@ -186,4 +176,4 @@ MgmtMarshallType
 
 .. c:macro:: MGMT_MARSHALL_STRING
 
-.. c:macro:: MGMT_MARSHALL_DATA
\ No newline at end of file
+.. c:macro:: MGMT_MARSHALL_DATA
diff --git a/lib/records/I_RecAlarms.h b/lib/records/I_RecAlarms.h
index 4cab2f5..a3dc5b8 100644
--- a/lib/records/I_RecAlarms.h
+++ b/lib/records/I_RecAlarms.h
@@ -24,22 +24,22 @@
 #pragma once
 
 // copy from mgmt/Alarms.h
+#define REC_ALARM_UNDEFINED 0
+
 #define REC_ALARM_PROXY_PROCESS_DIED 1
 #define REC_ALARM_PROXY_PROCESS_BORN 2
-#define REC_ALARM_PROXY_PEER_BORN 3
-#define REC_ALARM_PROXY_PEER_DIED 4
+// Currently unused: 3
+// Currently unused: 4
 #define REC_ALARM_PROXY_CONFIG_ERROR 5
 #define REC_ALARM_PROXY_SYSTEM_ERROR 6
-#define REC_ALARM_PROXY_LOG_SPACE_CRISIS 7
+// Currently unused: 7
 #define REC_ALARM_PROXY_CACHE_ERROR 8
 #define REC_ALARM_PROXY_CACHE_WARNING 9
 #define REC_ALARM_PROXY_LOGGING_ERROR 10
 #define REC_ALARM_PROXY_LOGGING_WARNING 11
 // Currently unused: 12
-#define REC_ALARM_REC_TEST 13
+// Currently unused: 13
 #define REC_ALARM_CONFIG_UPDATE_FAILED 14
-#define REC_ALARM_WEB_ERROR 15
-#define REC_ALARM_PING_FAILURE 16
+// Currently unused: 15
+// Currently unused: 16
 #define REC_ALARM_REC_CONFIG_ERROR 17
-#define REC_ALARM_ADD_ALARM 18
-#define REC_ALARM_PROXY_LOG_SPACE_ROLLED 19
diff --git a/lib/records/I_RecSignals.h b/lib/records/I_RecSignals.h
index 388c809..69d72bb 100644
--- a/lib/records/I_RecSignals.h
+++ b/lib/records/I_RecSignals.h
@@ -24,20 +24,21 @@
 #pragma once
 
 // copy from mgmt/BaseManager.h
+
 #define REC_SIGNAL_PID 0
-#define REC_SIGNAL_MACHINE_UP 1
-#define REC_SIGNAL_MACHINE_DOWN 2
+// Currently unused: 1
+// Currently unused: 2
 #define REC_SIGNAL_CONFIG_ERROR 3
 #define REC_SIGNAL_SYSTEM_ERROR 4
-#define REC_SIGNAL_LOG_SPACE_CRISIS 5
-#define REC_SIGNAL_CONFIG_FILE_READ 6
+// Currently unused: 5
+// Currently unused: 6
 #define REC_SIGNAL_CACHE_ERROR 7
 #define REC_SIGNAL_CACHE_WARNING 8
 #define REC_SIGNAL_LOGGING_ERROR 9
 #define REC_SIGNAL_LOGGING_WARNING 10
-// Currently unused: 11
-#define REC_SIGNAL_PLUGIN_CONFIG_REG 12
-#define REC_SIGNAL_PLUGIN_ADD_REC 13
+// Currently unused: 11 - 13
 #define REC_SIGNAL_PLUGIN_SET_CONFIG 14
-#define REC_SIGNAL_LOG_FILES_ROLLED 15
+// Currently unused: 15
 #define REC_SIGNAL_LIBRECORDS 16
+// Currently unused: 17 - 21
+#define REC_SIGNAL_CONFIG_FILE_CHILD 22
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index d7a3171..a252274 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -31,25 +31,24 @@
 #include "records/P_RecCore.h"
 
 const char *alarmText[] = {
-  "Unknown Alarm",
-  "[TrafficManager] Traffic Server process was reset.",
-  "[TrafficManager] Traffic Server process established.",
-  "New Peer",
-  "Peer Died",
-  "Invalid Configuration",
-  "System Error",
-  "Log Space Crisis",
-  "Cache Error",
-  "Cache Warning",
-  "Logging Error",
-  "Logging Warning",
-  "Mgmt Debugging Alarm",
-  "Configuration File Update Failed",
-  "Unable to Establish Manager User-Interface Services",
-  "Ping Failure",
-  "",
-  "Add OEM Alarm",
-  "",
+  "Unknown Alarm",                                        // 0
+  "[TrafficManager] Traffic Server process was reset.",   // 1
+  "[TrafficManager] Traffic Server process established.", // 2
+  "",                                                     // 3
+  "",                                                     // 4
+  "Invalid Configuration",                                // 5
+  "System Error",                                         // 6
+  "",                                                     // 7
+  "Cache Error",                                          // 8
+  "Cache Warning",                                        // 9
+  "Logging Error",                                        // 10
+  "Logging Warning",                                      // 11
+  "",                                                     // 12
+  "",                                                     // 13
+  "Alarms configuration update failed",                   // 14
+  "Ping Failure",                                         // 15
+  "",                                                     // 16
+  "Alarms configuration error",                           // 17
 };
 
 const int alarmTextNum = sizeof(alarmText) / sizeof(char *);
@@ -73,7 +72,6 @@ Alarms::Alarms()
 {
   cur_cb = 0;
   ink_mutex_init(&mutex);
-  alarmOEMcount = minOEMkey;
 } /* End Alarms::Alarms */
 
 Alarms::~Alarms()
@@ -166,24 +164,12 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
     break;
   case MGMT_ALARM_PROXY_CACHE_WARNING:
     return;
-  case MGMT_ALARM_PROXY_PEER_BORN:
-    priority = 3;
-    break;
-  case MGMT_ALARM_PROXY_PEER_DIED:
-    priority = 3;
-    break;
-  case MGMT_ALARM_PING_FAILURE:
-    priority = 1;
-    break;
   case MGMT_ALARM_PROXY_PROCESS_DIED:
     priority = 1;
     break;
   case MGMT_ALARM_PROXY_PROCESS_BORN:
     mgmt_log("[Alarms::signalAlarm] Server Process born\n");
     return;
-  case MGMT_ALARM_ADD_ALARM:
-    priority = 2;
-    break;
   default:
     priority = 2;
     break;
@@ -222,12 +208,6 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
 
   ink_mutex_acquire(&mutex);
   if (!ip) {
-    // if an OEM alarm, then must create the unique key alarm type;
-    // this key is used to hash the new OEM alarm description in the hash table
-    if (a == MGMT_ALARM_ADD_ALARM) {
-      a = (alarmOEMcount - minOEMkey) % (maxOEMkey - minOEMkey) + minOEMkey;
-      alarmOEMcount++;
-    }
     snprintf(buf, sizeof(buf), "%d", a);
     if (local_alarms.find(buf) != local_alarms.end()) {
       ink_mutex_release(&mutex);
diff --git a/mgmt/Alarms.h b/mgmt/Alarms.h
index ce3317e..e861a45 100644
--- a/mgmt/Alarms.h
+++ b/mgmt/Alarms.h
@@ -40,36 +40,28 @@ class AppVersionInfo;
 // When adding new alarms, please make sure add the
 //   corresponding alarm text
 //
+#define MGMT_ALARM_UNDEFINED 0
+
 #define MGMT_ALARM_PROXY_PROCESS_DIED 1
 #define MGMT_ALARM_PROXY_PROCESS_BORN 2
-#define MGMT_ALARM_PROXY_PEER_BORN 3 /* Data is ip addr */
-#define MGMT_ALARM_PROXY_PEER_DIED 4
+// Currently unused: 3
+// Currently unused: 4
 #define MGMT_ALARM_PROXY_CONFIG_ERROR 5 /* Data is descriptive string */
 #define MGMT_ALARM_PROXY_SYSTEM_ERROR 6
-#define MGMT_ALARM_PROXY_LOG_SPACE_CRISIS 7
+// Currently unused: 7
 #define MGMT_ALARM_PROXY_CACHE_ERROR 8
 #define MGMT_ALARM_PROXY_CACHE_WARNING 9
 #define MGMT_ALARM_PROXY_LOGGING_ERROR 10
 #define MGMT_ALARM_PROXY_LOGGING_WARNING 11
-#define MGMT_ALARM_MGMT_TEST 13 /* to aid in debugging */
+// Currently unused: 13
 #define MGMT_ALARM_CONFIG_UPDATE_FAILED 14
-#define MGMT_ALARM_WEB_ERROR 15
-#define MGMT_ALARM_PING_FAILURE 16
+// Currently unused: 15
+// Currently unused: 16
 #define MGMT_ALARM_MGMT_CONFIG_ERROR 17
-#define MGMT_ALARM_ADD_ALARM 18              /* OEM_ALARM */
-#define MGMT_ALARM_PROXY_LOG_SPACE_ROLLED 19 /* Alarm when log files will be rolled */
-
-#define MGMT_ALARM_SAC_SERVER_DOWN 400
 
 extern const char *alarmText[];
 extern const int alarmTextNum;
 
-/* OEM_ALARM: the alarm type is used as a key for hash tables;
-   need offset and modulo constants which will keep the unique
-   keys for OEM alarms within a specified range */
-const int minOEMkey = 1000; // used as offset
-const int maxOEMkey = 6000;
-
 typedef int alarm_t;
 typedef void (*AlarmCallbackFunc)(alarm_t, const char *, const char *);
 
@@ -116,10 +108,4 @@ private:
   std::unordered_map<std::string, AlarmCallbackFunc> cblist;
   std::unordered_map<std::string, Alarm *> local_alarms;
   std::unordered_map<std::string, Alarm *> remote_alarms;
-
-  /* counter is added in order to provide unique keys for OEM alarms,
-     since an OEM_ALARM type can be associated with many different
-     alarm descriptions */
-  int alarmOEMcount;
-
 }; /* End class Alarms */
diff --git a/mgmt/BaseManager.h b/mgmt/BaseManager.h
index 291c0cd..6cfd57e 100644
--- a/mgmt/BaseManager.h
+++ b/mgmt/BaseManager.h
@@ -70,12 +70,12 @@
 
 // Signal flows: traffic server -> traffic manager
 #define MGMT_SIGNAL_PID 0
-#define MGMT_SIGNAL_MACHINE_UP 1 /* Data is ip addr */
-#define MGMT_SIGNAL_MACHINE_DOWN 2
+// Currently unused: 1
+// Currently unused: 2
 #define MGMT_SIGNAL_CONFIG_ERROR 3 /* Data is descriptive string */
 #define MGMT_SIGNAL_SYSTEM_ERROR 4
-#define MGMT_SIGNAL_LOG_SPACE_CRISIS 5
-#define MGMT_SIGNAL_CONFIG_FILE_READ 6
+// Currently unused: 5
+// Currently unused: 6
 #define MGMT_SIGNAL_CACHE_ERROR 7
 #define MGMT_SIGNAL_CACHE_WARNING 8
 #define MGMT_SIGNAL_LOGGING_ERROR 9
@@ -84,13 +84,11 @@
 // Currently unused: 12
 // Currently unused: 13
 #define MGMT_SIGNAL_PLUGIN_SET_CONFIG 14
-#define MGMT_SIGNAL_LOG_FILES_ROLLED 15
+// Currently unused: 15
 #define MGMT_SIGNAL_LIBRECORDS 16
-
+// Currently unused: 17 - 21
 #define MGMT_SIGNAL_CONFIG_FILE_CHILD 22
 
-#define MGMT_SIGNAL_SAC_SERVER_DOWN 400
-
 struct MgmtMessageHdr {
   int msg_id;
   int data_len;
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index 3c33dc7..a834e68 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -493,25 +493,6 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
     RecSetRecordInt("proxy.node.proxy_running", 1, REC_SOURCE_DEFAULT);
     break;
 
-  case MGMT_SIGNAL_MACHINE_UP:
-    /*
-       {
-       struct in_addr addr;
-       addr.s_addr = *((unsigned int*)data_raw);
-       alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_PEER_BORN, inet_ntoa(addr));
-       }
-     */
-    break;
-  case MGMT_SIGNAL_MACHINE_DOWN:
-    /*
-       {
-       struct in_addr addr;
-       addr.s_addr = *((unsigned int*)data_raw);
-       alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_PEER_DIED, inet_ntoa(addr));
-       }
-     */
-    break;
-
   // FIX: This is very messy need to correlate mgmt signals and
   // alarms better
   case MGMT_SIGNAL_CONFIG_ERROR:
@@ -520,9 +501,6 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
   case MGMT_SIGNAL_SYSTEM_ERROR:
     alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR, data_raw);
     break;
-  case MGMT_SIGNAL_LOG_SPACE_CRISIS:
-    alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_LOG_SPACE_CRISIS, data_raw);
-    break;
   case MGMT_SIGNAL_CACHE_ERROR:
     alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_CACHE_ERROR, data_raw);
     break;
@@ -535,9 +513,6 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
   case MGMT_SIGNAL_LOGGING_WARNING:
     alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_LOGGING_WARNING, data_raw);
     break;
-  case MGMT_SIGNAL_CONFIG_FILE_READ:
-    mgmt_log("[LocalManager::handleMgmtMsgFromProcesses] File done '%d'\n", data_raw);
-    break;
   case MGMT_SIGNAL_PLUGIN_SET_CONFIG: {
     char var_name[256];
     char var_value[256];
@@ -562,10 +537,6 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
       break;
     }
   } break;
-  case MGMT_SIGNAL_LOG_FILES_ROLLED: {
-    Debug("lm", "Rolling logs %s", (char *)data_raw);
-    break;
-  }
   case MGMT_SIGNAL_LIBRECORDS:
     if (mh->data_len > 0) {
       executeMgmtCallback(MGMT_SIGNAL_LIBRECORDS, {data_raw, static_cast<size_t>(mh->data_len)});
@@ -588,9 +559,6 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
     ats_free_null(parent);
     ats_free_null(child);
   } break;
-  case MGMT_SIGNAL_SAC_SERVER_DOWN:
-    alarm_keeper->signalAlarm(MGMT_ALARM_SAC_SERVER_DOWN, data_raw);
-    break;
 
   default:
     break;
diff --git a/mgmt/api/CoreAPIShared.cc b/mgmt/api/CoreAPIShared.cc
index 5ee8fd8..3c1eb0e 100644
--- a/mgmt/api/CoreAPIShared.cc
+++ b/mgmt/api/CoreAPIShared.cc
@@ -300,16 +300,10 @@ get_event_id(const char *event_name)
     return MGMT_ALARM_PROXY_PROCESS_DIED;
   } else if (strcmp("MGMT_ALARM_PROXY_PROCESS_BORN", event_name) == 0) {
     return MGMT_ALARM_PROXY_PROCESS_BORN;
-  } else if (strcmp("MGMT_ALARM_PROXY_PEER_BORN", event_name) == 0) {
-    return MGMT_ALARM_PROXY_PEER_BORN;
-  } else if (strcmp("MGMT_ALARM_PROXY_PEER_DIED", event_name) == 0) {
-    return MGMT_ALARM_PROXY_PEER_DIED;
   } else if (strcmp("MGMT_ALARM_PROXY_CONFIG_ERROR", event_name) == 0) {
     return MGMT_ALARM_PROXY_CONFIG_ERROR;
   } else if (strcmp("MGMT_ALARM_PROXY_SYSTEM_ERROR", event_name) == 0) {
     return MGMT_ALARM_PROXY_SYSTEM_ERROR;
-  } else if (strcmp("MGMT_ALARM_PROXY_LOG_SPACE_CRISIS", event_name) == 0) {
-    return MGMT_ALARM_PROXY_LOG_SPACE_CRISIS;
   } else if (strcmp("MGMT_ALARM_PROXY_CACHE_ERROR", event_name) == 0) {
     return MGMT_ALARM_PROXY_CACHE_ERROR;
   } else if (strcmp("MGMT_ALARM_PROXY_CACHE_WARNING", event_name) == 0) {
@@ -318,14 +312,8 @@ get_event_id(const char *event_name)
     return MGMT_ALARM_PROXY_LOGGING_ERROR;
   } else if (strcmp("MGMT_ALARM_PROXY_LOGGING_WARNING", event_name) == 0) {
     return MGMT_ALARM_PROXY_LOGGING_WARNING;
-  } else if (strcmp("MGMT_ALARM_MGMT_TEST", event_name) == 0) {
-    return MGMT_ALARM_MGMT_TEST;
   } else if (strcmp("MGMT_ALARM_CONFIG_UPDATE_FAILED", event_name) == 0) {
     return MGMT_ALARM_CONFIG_UPDATE_FAILED;
-  } else if (strcmp("MGMT_ALARM_WEB_ERROR", event_name) == 0) {
-    return MGMT_ALARM_WEB_ERROR;
-  } else if (strcmp("MGMT_ALARM_PING_FAILURE", event_name) == 0) {
-    return MGMT_ALARM_PING_FAILURE;
   }
 
   return -1;
@@ -350,21 +338,12 @@ get_event_name(int id)
   case MGMT_ALARM_PROXY_PROCESS_BORN:
     ink_strlcpy(name, "MGMT_ALARM_PROXY_PROCESS_BORN", sizeof(name));
     break;
-  case MGMT_ALARM_PROXY_PEER_BORN:
-    ink_strlcpy(name, "MGMT_ALARM_PROXY_PEER_BORN", sizeof(name));
-    break;
-  case MGMT_ALARM_PROXY_PEER_DIED:
-    ink_strlcpy(name, "MGMT_ALARM_PROXY_PEER_DIED", sizeof(name));
-    break;
   case MGMT_ALARM_PROXY_CONFIG_ERROR:
     ink_strlcpy(name, "MGMT_ALARM_PROXY_CONFIG_ERROR", sizeof(name));
     break;
   case MGMT_ALARM_PROXY_SYSTEM_ERROR:
     ink_strlcpy(name, "MGMT_ALARM_PROXY_SYSTEM_ERROR", sizeof(name));
     break;
-  case MGMT_ALARM_PROXY_LOG_SPACE_CRISIS:
-    ink_strlcpy(name, "MGMT_ALARM_PROXY_LOG_SPACE_CRISIS", sizeof(name));
-    break;
   case MGMT_ALARM_PROXY_CACHE_ERROR:
     ink_strlcpy(name, "MGMT_ALARM_PROXY_CACHE_ERROR", sizeof(name));
     break;
@@ -377,24 +356,12 @@ get_event_name(int id)
   case MGMT_ALARM_PROXY_LOGGING_WARNING:
     ink_strlcpy(name, "MGMT_ALARM_PROXY_LOGGING_WARNING", sizeof(name));
     break;
-  case MGMT_ALARM_MGMT_TEST:
-    ink_strlcpy(name, "MGMT_ALARM_MGMT_TEST", sizeof(name));
-    break;
   case MGMT_ALARM_CONFIG_UPDATE_FAILED:
     ink_strlcpy(name, "MGMT_ALARM_CONFIG_UPDATE_FAILED", sizeof(name));
     break;
-  case MGMT_ALARM_WEB_ERROR:
-    ink_strlcpy(name, "MGMT_ALARM_WEB_ERROR", sizeof(name));
-    break;
-  case MGMT_ALARM_PING_FAILURE:
-    ink_strlcpy(name, "MGMT_ALARM_PING_FAILURE", sizeof(name));
-    break;
   case MGMT_ALARM_MGMT_CONFIG_ERROR:
     ink_strlcpy(name, "MGMT_ALARM_MGMT_CONFIG_ERROR", sizeof(name));
     break;
-  case MGMT_ALARM_ADD_ALARM:
-    ink_strlcpy(name, "MGMT_ALARM_ADD_ALARM", sizeof(name));
-    break;
   default:
     return nullptr;
   }
diff --git a/mgmt/api/CoreAPIShared.h b/mgmt/api/CoreAPIShared.h
index eaa8682..310ba35 100644
--- a/mgmt/api/CoreAPIShared.h
+++ b/mgmt/api/CoreAPIShared.h
@@ -44,24 +44,24 @@
  * access to these values for its event handling
  */
 #define MGMT_ALARM_UNDEFINED 0
+
 #define MGMT_ALARM_PROXY_PROCESS_DIED 1
 #define MGMT_ALARM_PROXY_PROCESS_BORN 2
-#define MGMT_ALARM_PROXY_PEER_BORN 3
-#define MGMT_ALARM_PROXY_PEER_DIED 4
+// Currently unused: 3
+// Currently unused: 4
 #define MGMT_ALARM_PROXY_CONFIG_ERROR 5
 #define MGMT_ALARM_PROXY_SYSTEM_ERROR 6
-#define MGMT_ALARM_PROXY_LOG_SPACE_CRISIS 7
+// Currently unused: 7
 #define MGMT_ALARM_PROXY_CACHE_ERROR 8
 #define MGMT_ALARM_PROXY_CACHE_WARNING 9
 #define MGMT_ALARM_PROXY_LOGGING_ERROR 10
 #define MGMT_ALARM_PROXY_LOGGING_WARNING 11
 // Currently unused: 12
-#define MGMT_ALARM_MGMT_TEST 13
+// Currently unused: 13
 #define MGMT_ALARM_CONFIG_UPDATE_FAILED 14
-#define MGMT_ALARM_WEB_ERROR 15
-#define MGMT_ALARM_PING_FAILURE 16
+// Currently unused: 15
+// Currently unused: 16
 #define MGMT_ALARM_MGMT_CONFIG_ERROR 17
-#define MGMT_ALARM_ADD_ALARM 18
 
 // used by TSReadFromUrl
 #define HTTP_DIVIDER "\r\n\r\n"
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index c88c0df..dcc8cd7 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -507,15 +507,6 @@ tsapi TSMgmtError TSRecordSetMlt(TSList rec_list, TSActionNeedT *action_need);
  * by specifying the event's name (which is predefined and immutable).
  */
 
-/* UNIMPLEMENTED - wait for new alarm processor */
-/* TSEventSignal: enables the user to trigger an event
- * Input:  event_name - "MGMT_ALARM_ADD_ALARM"
- *         ...        - variable argument list of parameters that go
- *                       go into event description when it is signalled
- * Output: TSMgmtError
- */
-/*tsapi TSMgmtError               TSEventSignal (char *event_name, ...); */
-
 /* TSEventResolve: enables the user to resolve an event
  * Input:  event_name - event to resolve
  * Output: TSMgmtError
diff --git a/src/traffic_manager/traffic_manager.cc b/src/traffic_manager/traffic_manager.cc
index f7d3835..4768a51 100644
--- a/src/traffic_manager/traffic_manager.cc
+++ b/src/traffic_manager/traffic_manager.cc
@@ -671,14 +671,12 @@ main(int argc, const char **argv)
   mode_t oldmask = umask(0);
   mode_t newmode = api_socket_is_restricted() ? 00700 : 00777;
 
-  int mgmtapiFD         = -1; // FD for the api interface to issue commands
-  int eventapiFD        = -1; // FD for the api and clients to handle event callbacks
-  char mgmtapiFailMsg[] = "Traffic server management API service Interface Failed to Initialize.";
+  int mgmtapiFD  = -1; // FD for the api interface to issue commands
+  int eventapiFD = -1; // FD for the api and clients to handle event callbacks
 
   mgmtapiFD = bind_unix_domain_socket(apisock.c_str(), newmode);
   if (mgmtapiFD == -1) {
     mgmt_log("[WebIntrMain] Unable to set up socket for handling management API calls. API
socket path = %s\n", apisock.c_str());
-    lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_WEB_ERROR, mgmtapiFailMsg);
   }
 
   eventapiFD = bind_unix_domain_socket(eventsock.c_str(), newmode);


Mime
View raw message