Author: zwoop
Date: Thu Jan 13 18:27:28 2011
New Revision: 1058702
URL: http://svn.apache.org/viewvc?rev=1058702&view=rev
Log:
TS-637 remove MgmtPing it was found to be unusuable in prod
Removed:
trafficserver/traffic/trunk/proxy/mgmt/utils/MgmtPing.cc
trafficserver/traffic/trunk/proxy/mgmt/utils/MgmtPing.h
Modified:
trafficserver/traffic/trunk/proxy/mgmt/Main.cc
trafficserver/traffic/trunk/proxy/mgmt/Main.h
trafficserver/traffic/trunk/proxy/mgmt/cluster/VMap.cc
trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am
Modified: trafficserver/traffic/trunk/proxy/mgmt/Main.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Main.cc?rev=1058702&r1=1058701&r2=1058702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Main.cc Thu Jan 13 18:27:28 2011
@@ -82,7 +82,6 @@ extern "C" int getpwnam_r(const char *na
#endif
LocalManager *lmgmt = NULL;
-MgmtPing *icmp_ping;
FileManager *configFiles;
StatProcessor *statProcessor; // Statistics Processors
@@ -652,10 +651,6 @@ main(int argc, char **argv)
diags = diagsConfig->diags;
diags->prefix_str = "Manager ";
-/* Disable 12/14/98 (see explanation below)
- icmp_ping = new MgmtPing(); */
- icmp_ping = NULL;
-
init_dirs(false);// setup directories
// Get the config info we need while we are still root
@@ -774,20 +769,6 @@ main(int argc, char **argv)
// stat the 'sync_thr' until 'configFiles' has been initialized.
RecLocalStart();
-/* Disabled 12/14/98
- * Goldmine is seeing ping failures for no apparent reason.
- * My tests show that the ping packets go over the loop back interface
- * and the driver forwards them to loop back even if the link status
- * for the interface is down
- if(!icmp_ping->init()) { // Initialize after the records data object has
been created
- delete icmp_ping;
- icmp_ping = NULL;
- lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR,
- "Unable to open raw icmp socket,
Virtual IP failover at risk"
- " if multiple interfaces are present
on this node.");
- }
- */
-
/* Update cmd line overrides/environmental overrides/etc */
if (tsArgs) { /* Passed command line args for proxy */
if (lmgmt->proxy_options) {
Modified: trafficserver/traffic/trunk/proxy/mgmt/Main.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Main.h?rev=1058702&r1=1058701&r2=1058702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Main.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Main.h Thu Jan 13 18:27:28 2011
@@ -26,7 +26,6 @@
#include "LocalManager.h"
#include "FileManager.h"
-#include "MgmtPing.h"
#include "WebOverview.h"
#include "I_Version.h"
@@ -45,7 +44,6 @@ void runAsUser(char *userName);
void extractConfigInfo(char *mgmt_path, const char *recs_conf, char *userName,
int *fds_throttle);
void printUsage(void);
-extern MgmtPing *icmp_ping;
extern FileManager *configFiles;
extern overviewPage *overviewGenerator;
extern AppVersionInfo appVersionInfo;
Modified: trafficserver/traffic/trunk/proxy/mgmt/cluster/VMap.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/cluster/VMap.cc?rev=1058702&r1=1058701&r2=1058702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/cluster/VMap.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/cluster/VMap.cc Thu Jan 13 18:27:28
2011
@@ -365,44 +365,6 @@ VMap::lt_runGambit()
xfree(conf_addr);
}
-
- /* Ping our bound interface's real ip address to make sure it is alive */
- InkHashTableEntry *entry;
- InkHashTableIteratorState iterator_state;
-
- for (entry = ink_hash_table_iterator_first(interface_realip_map,
&iterator_state);
- entry != NULL; entry =
ink_hash_table_iterator_next(interface_realip_map, &iterator_state)) {
-
- char *key = (char *) ink_hash_table_entry_key(interface_realip_map, entry);
- RealIPInfo *tmp = (RealIPInfo *)
ink_hash_table_entry_value(interface_realip_map, entry);
-
- if (tmp->mappings_for_interface) {
- char ip[24];
-
- ink_strncpy(ip, inet_ntoa(tmp->real_ip), sizeof(ip));
-
- /* If we only have 1 interface anyway not much help to do the ping test
*/
- if (num_nics == 1) {
- break;
- }
-
- if (icmp_ping && icmp_ping->pingAddress(ip)) {
-
- /*
- * All is well, perhaps record this...?
- */
- } else if (icmp_ping) {
- char error[512];
-
- snprintf(error, sizeof(error), "[VMap::lt_runGambit] ICMP echo failed
for interface"
- " '%s' real-ip: '%s'. Shutting down node!\n", key,
inet_ntoa(tmp->real_ip));
- lmgmt->processShutdown();
- mgmt_elog(error);
- lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PING_FAILURE, error);
- }
- }
- }
-
ink_mutex_release(mutex);
return;
} /* End VMap::lt_runGambit */
Modified: trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am?rev=1058702&r1=1058701&r2=1058702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/utils/Makefile.am Thu Jan 13
18:27:28 2011
@@ -46,8 +46,6 @@ libutils_lm_a_SOURCES = \
ExpandingArray.h \
IpLookup.cc \
IpLookup.h \
- MgmtPing.cc \
- MgmtPing.h \
MgmtSchema.cc \
MgmtSchema.h \
MgmtUtils.cc \
