Network: Add network.address.serialization.resolve setting (defaults …

…to false) to always resolve publish address based on host name, closes elastic#1899.
hibnico · May 2, 2012 · 27baac8 · 27baac8
1 parent 21f363e
commit 27baac8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/org/elasticsearch/common/network/NetworkService.java b/src/main/java/org/elasticsearch/common/network/NetworkService.java
@@ -22,6 +22,7 @@
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
@@ -83,6 +84,7 @@ public static interface CustomNameResolver {
     @Inject
     public NetworkService(Settings settings) {
         super(settings);
+        InetSocketTransportAddress.setResolveAddress(settings.getAsBoolean("network.address.serialization.resolve", false));
     }
 
     /**

diff --git a/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java b/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
@@ -33,6 +33,12 @@
  */
 public class InetSocketTransportAddress implements TransportAddress {
 
+    private static boolean resolveAddress = false;
+
+    public static void setResolveAddress(boolean resolveAddress) {
+        InetSocketTransportAddress.resolveAddress = resolveAddress;
+    }
+
     private InetSocketAddress address;
 
     InetSocketTransportAddress() {
@@ -118,7 +124,7 @@ public void readFrom(StreamInput in) throws IOException {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (address.getAddress() != null) {
+        if (!resolveAddress && address.getAddress() != null) {
             out.writeByte((byte) 0);
             byte[] bytes = address().getAddress().getAddress();  // 4 bytes (IPv4) or 16 bytes (IPv6)
             out.writeByte((byte) bytes.length); // 1 byte