fix problem with transport client starting

kimchy · kimchy · commit 10a245e76dea · 2010-05-22T02:13:39.000+03:00
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ExceptionsHelper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/ExceptionsHelper.java
@@ -19,14 +19,31 @@
 
 package org.elasticsearch;
 
+import org.elasticsearch.util.logging.ESLogger;
+import org.elasticsearch.util.logging.Loggers;
+
 /**
- * @author kimchy (Shay Banon)
+ * @author kimchy (shay.banon)
  */
 public final class ExceptionsHelper {
 
+    private static final ESLogger logger = Loggers.getLogger(ExceptionsHelper.class);
+
     public static Throwable unwrapCause(Throwable t) {
+        int counter = 0;
         Throwable result = t;
         while (result instanceof ElasticSearchWrapperException) {
+            if (t.getCause() == null) {
+                return result;
+            }
+            if (t.getCause() == t) {
+                return result;
+            }
+            if (counter++ > 10) {
+                // dear god, if we got more than 10 levels down, WTF? just bail
+                logger.warn("Exception cause unwrapping ran for 10 levels...", t);
+                return result;
+            }
             result = t.getCause();
         }
         return result;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java
@@ -42,4 +42,8 @@ public class JmxNetworkProbe extends AbstractComponent implements NetworkProbe {
         stats.timestamp = System.currentTimeMillis();
         return stats;
     }
+
+    @Override public String ifconfig() {
+        return "NA";
+    }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java
@@ -27,4 +27,6 @@ public interface NetworkProbe {
     NetworkInfo networkInfo();
 
     NetworkStats networkStats();
+
+    String ifconfig();
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java
@@ -23,6 +23,10 @@
 import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;
 
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Enumeration;
+
 /**
  * @author kimchy (shay.banon)
  */
@@ -37,6 +41,36 @@ public class NetworkService extends AbstractComponent {
         this.probe = probe;
 
         this.info = probe.networkInfo();
+
+        if (logger.isDebugEnabled()) {
+            StringBuilder netDebug = new StringBuilder("net_info");
+            try {
+                Enumeration<NetworkInterface> enum_ = NetworkInterface.getNetworkInterfaces();
+                String hostName = InetAddress.getLocalHost().getHostName();
+                netDebug.append("\nhost [").append(hostName).append("]\n");
+                while (enum_.hasMoreElements()) {
+                    NetworkInterface net = enum_.nextElement();
+
+                    netDebug.append(net.getName()).append('\t').append("display_name [").append(net.getDisplayName()).append("]\n");
+                    Enumeration<InetAddress> addresses = net.getInetAddresses();
+                    netDebug.append("\t\taddress ");
+                    while (addresses.hasMoreElements()) {
+                        netDebug.append("[").append(addresses.nextElement()).append("] ");
+                    }
+                    netDebug.append('\n');
+                    netDebug.append("\t\tmtu [").append(net.getMTU()).append("] multicast [").append(net.supportsMulticast()).append("] ptp [").append(net.isPointToPoint())
+                            .append("] loopback [").append(net.isLoopback()).append("] up [").append(net.isUp()).append("] virtual [").append(net.isVirtual()).append("]")
+                            .append('\n');
+                }
+            } catch (Exception ex) {
+                netDebug.append("Failed to get Network Interface Info [" + ex.getMessage() + "]");
+            }
+            logger.debug(netDebug.toString());
+        }
+
+        if (logger.isTraceEnabled()) {
+            logger.trace("ifconfig\n\n" + ifconfig());
+        }
     }
 
     public NetworkInfo info() {
@@ -46,4 +80,8 @@ public NetworkInfo info() {
     public NetworkStats stats() {
         return probe.networkStats();
     }
+
+    public String ifconfig() {
+        return probe.ifconfig();
+    }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java
@@ -23,10 +23,7 @@
 import org.elasticsearch.util.component.AbstractComponent;
 import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;
-import org.hyperic.sigar.NetInterfaceConfig;
-import org.hyperic.sigar.Sigar;
-import org.hyperic.sigar.SigarException;
-import org.hyperic.sigar.Tcp;
+import org.hyperic.sigar.*;
 
 /**
  * @author kimchy (shay.banon)
@@ -80,4 +77,85 @@ public class SigarNetworkProbe extends AbstractComponent implements NetworkProbe
 
         return stats;
     }
+
+    @Override public String ifconfig() {
+        Sigar sigar = sigarService.sigar();
+        StringBuilder sb = new StringBuilder();
+        try {
+            for (String ifname : sigar.getNetInterfaceList()) {
+                NetInterfaceConfig ifconfig = null;
+                try {
+                    ifconfig = sigar.getNetInterfaceConfig(ifname);
+                } catch (SigarException e) {
+                    sb.append(ifname + "\t" + "Not Avaialbe [" + e.getMessage() + "]");
+                }
+                long flags = ifconfig.getFlags();
+
+                String hwaddr = "";
+                if (!NetFlags.NULL_HWADDR.equals(ifconfig.getHwaddr())) {
+                    hwaddr = " HWaddr " + ifconfig.getHwaddr();
+                }
+
+                if (!ifconfig.getName().equals(ifconfig.getDescription())) {
+                    sb.append(ifconfig.getDescription()).append('\n');
+                }
+
+                sb.append(ifconfig.getName() + "\t" + "Link encap:" + ifconfig.getType() + hwaddr).append('\n');
+
+                String ptp = "";
+                if ((flags & NetFlags.IFF_POINTOPOINT) > 0) {
+                    ptp = "  P-t-P:" + ifconfig.getDestination();
+                }
+
+                String bcast = "";
+                if ((flags & NetFlags.IFF_BROADCAST) > 0) {
+                    bcast = "  Bcast:" + ifconfig.getBroadcast();
+                }
+
+                sb.append("\t" +
+                        "inet addr:" + ifconfig.getAddress() +
+                        ptp + //unlikely
+                        bcast +
+                        "  Mask:" + ifconfig.getNetmask()).append('\n');
+
+                sb.append("\t" +
+                        NetFlags.getIfFlagsString(flags) +
+                        " MTU:" + ifconfig.getMtu() +
+                        "  Metric:" + ifconfig.getMetric()).append('\n');
+                try {
+                    NetInterfaceStat ifstat = sigar.getNetInterfaceStat(ifname);
+
+                    sb.append("\t" +
+                            "RX packets:" + ifstat.getRxPackets() +
+                            " errors:" + ifstat.getRxErrors() +
+                            " dropped:" + ifstat.getRxDropped() +
+                            " overruns:" + ifstat.getRxOverruns() +
+                            " frame:" + ifstat.getRxFrame()).append('\n');
+
+                    sb.append("\t" +
+                            "TX packets:" + ifstat.getTxPackets() +
+                            " errors:" + ifstat.getTxErrors() +
+                            " dropped:" + ifstat.getTxDropped() +
+                            " overruns:" + ifstat.getTxOverruns() +
+                            " carrier:" + ifstat.getTxCarrier()).append('\n');
+                    sb.append("\t" + "collisions:" +
+                            ifstat.getTxCollisions()).append('\n');
+
+                    long rxBytes = ifstat.getRxBytes();
+                    long txBytes = ifstat.getTxBytes();
+
+                    sb.append("\t" +
+                            "RX bytes:" + rxBytes +
+                            " (" + Sigar.formatSize(rxBytes) + ")" +
+                            "  " +
+                            "TX bytes:" + txBytes +
+                            " (" + Sigar.formatSize(txBytes) + ")").append('\n');
+                } catch (SigarException e) {
+                }
+            }
+            return sb.toString();
+        } catch (SigarException e) {
+            return "NA";
+        }
+    }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java
@@ -41,8 +41,4 @@ public class JmxOsProbe extends AbstractComponent implements OsProbe {
         stats.timestamp = System.currentTimeMillis();
         return stats;
     }
-
-    @Override public String ifconfig() {
-        return "NA";
-    }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
@@ -27,6 +27,4 @@ public interface OsProbe {
     OsInfo osInfo();
 
     OsStats osStats();
-
-    String ifconfig();
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java
@@ -48,8 +48,4 @@ public OsInfo info() {
     public OsStats stats() {
         return probe.osStats();
     }
-
-    public String ifconfig() {
-        return probe.ifconfig();
-    }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java b/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java
@@ -126,85 +126,4 @@ public class SigarOsProbe extends AbstractComponent implements OsProbe {
 
         return stats;
     }
-
-    @Override public String ifconfig() {
-        Sigar sigar = sigarService.sigar();
-        StringBuilder sb = new StringBuilder();
-        try {
-            for (String ifname : sigar.getNetInterfaceList()) {
-                NetInterfaceConfig ifconfig = null;
-                try {
-                    ifconfig = sigar.getNetInterfaceConfig(ifname);
-                } catch (SigarException e) {
-                    sb.append(ifname + "\t" + "Not Avaialbe [" + e.getMessage() + "]");
-                }
-                long flags = ifconfig.getFlags();
-
-                String hwaddr = "";
-                if (!NetFlags.NULL_HWADDR.equals(ifconfig.getHwaddr())) {
-                    hwaddr = " HWaddr " + ifconfig.getHwaddr();
-                }
-
-                if (!ifconfig.getName().equals(ifconfig.getDescription())) {
-                    sb.append(ifconfig.getDescription()).append('\n');
-                }
-
-                sb.append(ifconfig.getName() + "\t" + "Link encap:" + ifconfig.getType() + hwaddr).append('\n');
-
-                String ptp = "";
-                if ((flags & NetFlags.IFF_POINTOPOINT) > 0) {
-                    ptp = "  P-t-P:" + ifconfig.getDestination();
-                }
-
-                String bcast = "";
-                if ((flags & NetFlags.IFF_BROADCAST) > 0) {
-                    bcast = "  Bcast:" + ifconfig.getBroadcast();
-                }
-
-                sb.append("\t" +
-                        "inet addr:" + ifconfig.getAddress() +
-                        ptp + //unlikely
-                        bcast +
-                        "  Mask:" + ifconfig.getNetmask()).append('\n');
-
-                sb.append("\t" +
-                        NetFlags.getIfFlagsString(flags) +
-                        " MTU:" + ifconfig.getMtu() +
-                        "  Metric:" + ifconfig.getMetric()).append('\n');
-                try {
-                    NetInterfaceStat ifstat = sigar.getNetInterfaceStat(ifname);
-
-                    sb.append("\t" +
-                            "RX packets:" + ifstat.getRxPackets() +
-                            " errors:" + ifstat.getRxErrors() +
-                            " dropped:" + ifstat.getRxDropped() +
-                            " overruns:" + ifstat.getRxOverruns() +
-                            " frame:" + ifstat.getRxFrame()).append('\n');
-
-                    sb.append("\t" +
-                            "TX packets:" + ifstat.getTxPackets() +
-                            " errors:" + ifstat.getTxErrors() +
-                            " dropped:" + ifstat.getTxDropped() +
-                            " overruns:" + ifstat.getTxOverruns() +
-                            " carrier:" + ifstat.getTxCarrier()).append('\n');
-                    sb.append("\t" + "collisions:" +
-                            ifstat.getTxCollisions()).append('\n');
-
-                    long rxBytes = ifstat.getRxBytes();
-                    long txBytes = ifstat.getTxBytes();
-
-                    sb.append("\t" +
-                            "RX bytes:" + rxBytes +
-                            " (" + Sigar.formatSize(rxBytes) + ")" +
-                            "  " +
-                            "TX bytes:" + txBytes +
-                            " (" + Sigar.formatSize(txBytes) + ")").append('\n');
-                } catch (SigarException e) {
-                }
-            }
-            return sb.toString();
-        } catch (SigarException e) {
-            return "NA";
-        }
-    }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkService.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.util.network;
 
-import org.elasticsearch.monitor.os.JmxOsProbe;
-import org.elasticsearch.monitor.os.OsService;
 import org.elasticsearch.util.MapBuilder;
 import org.elasticsearch.util.collect.ImmutableMap;
 import org.elasticsearch.util.component.AbstractComponent;
@@ -32,7 +30,6 @@
 import java.net.NetworkInterface;
 import java.net.UnknownHostException;
 import java.util.Collection;
-import java.util.Enumeration;
 
 /**
  * @author kimchy (shay.banon)
@@ -59,42 +56,8 @@ public static interface CustomNameResolver {
 
     private volatile ImmutableMap<String, CustomNameResolver> customNameResolvers = ImmutableMap.of();
 
-    public NetworkService(Settings settings) {
-        this(settings, new OsService(settings, new JmxOsProbe(settings)));
-    }
-
-    @Inject public NetworkService(Settings settings, OsService service) {
+    @Inject public NetworkService(Settings settings) {
         super(settings);
-
-        if (logger.isDebugEnabled()) {
-            StringBuilder netDebug = new StringBuilder("net_info");
-            try {
-                Enumeration<NetworkInterface> enum_ = NetworkInterface.getNetworkInterfaces();
-                String hostName = InetAddress.getLocalHost().getHostName();
-                netDebug.append("\nhost [").append(hostName).append("]\n");
-                while (enum_.hasMoreElements()) {
-                    NetworkInterface net = enum_.nextElement();
-
-                    netDebug.append(net.getName()).append('\t').append("display_name [").append(net.getDisplayName()).append("]\n");
-                    Enumeration<InetAddress> addresses = net.getInetAddresses();
-                    netDebug.append("\t\taddress ");
-                    while (addresses.hasMoreElements()) {
-                        netDebug.append("[").append(addresses.nextElement()).append("] ");
-                    }
-                    netDebug.append('\n');
-                    netDebug.append("\t\tmtu [").append(net.getMTU()).append("] multicast [").append(net.supportsMulticast()).append("] ptp [").append(net.isPointToPoint())
-                            .append("] loopback [").append(net.isLoopback()).append("] up [").append(net.isUp()).append("] virtual [").append(net.isVirtual()).append("]")
-                            .append('\n');
-                }
-            } catch (Exception ex) {
-                netDebug.append("Failed to get Network Interface Info [" + ex.getMessage() + "]");
-            }
-            logger.debug(netDebug.toString());
-        }
-
-        if (logger.isTraceEnabled()) {
-            logger.trace("ifconfig\n\n" + service.ifconfig());
-        }
     }
 
     public void addCustomNameResolver(String name, CustomNameResolver customNameResolver) {

Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,8 @@ public class JmxNetworkProbe extends AbstractComponent implements NetworkProbe {`
`42`	`42`	`stats.timestamp = System.currentTimeMillis();`
`43`	`43`	`return stats;`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ @Override public String ifconfig() {`
	`47`	`+ return "NA";`
	`48`	`+ }`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ public interface NetworkProbe {`
`27`	`27`	`NetworkInfo networkInfo();`
`28`	`28`
`29`	`29`	`NetworkStats networkStats();`
	`30`	`+`
	`31`	`+ String ifconfig();`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,4 @@ public class JmxOsProbe extends AbstractComponent implements OsProbe {`
`41`	`41`	`stats.timestamp = System.currentTimeMillis();`
`42`	`42`	`return stats;`
`43`	`43`	`}`
`44`		`-`
`45`		`- @Override public String ifconfig() {`
`46`		`- return "NA";`
`47`		`- }`
`48`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,4 @@ public interface OsProbe {`
`27`	`27`	`OsInfo osInfo();`
`28`	`28`
`29`	`29`	`OsStats osStats();`
`30`		`-`
`31`		`- String ifconfig();`
`32`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,4 @@ public OsInfo info() {`
`48`	`48`	`public OsStats stats() {`
`49`	`49`	`return probe.osStats();`
`50`	`50`	`}`
`51`		`-`
`52`		`- public String ifconfig() {`
`53`		`- return probe.ifconfig();`
`54`		`- }`
`55`	`51`	`}`