From bac135261cf4c0a04e4d55f1062a94b2179153b3 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Tue, 28 Apr 2015 12:18:43 -0400
Subject: [PATCH] Test: make sure that tests are not affected by changing in
 address resolution settings

---
 .../transport/InetSocketTransportAddress.java |  4 ++
 .../test/ElasticsearchIntegrationTest.java    | 53 +++++++++++--------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java b/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
index 1bc519435de..bfa4233d917 100644
--- a/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
+++ b/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
@@ -38,6 +38,10 @@ public class InetSocketTransportAddress implements TransportAddress {
         InetSocketTransportAddress.resolveAddress = resolveAddress;
     }
 
+    public static boolean getResolveAddress() {
+        return resolveAddress;
+    }
+
     private InetSocketAddress address;
 
     InetSocketTransportAddress() {
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index 0a5208f6763..f160e4cb653 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -1141,34 +1141,41 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
      */
     protected void ensureClusterStateConsistency() throws IOException {
         if (cluster() != null) {
-            ClusterState masterClusterState = client().admin().cluster().prepareState().all().get().getState();
-            byte[] masterClusterStateBytes = ClusterState.Builder.toBytes(masterClusterState);
-            // remove local node reference
-            masterClusterState = ClusterState.Builder.fromBytes(masterClusterStateBytes, null);
-            Map<String, Object> masterStateMap = convertToMap(masterClusterState);
-            int masterClusterStateSize = ClusterState.Builder.toBytes(masterClusterState).length;
-            for (Client client : cluster()) {
-                ClusterState localClusterState = client.admin().cluster().prepareState().all().setLocal(true).get().getState();
-                byte[] localClusterStateBytes = ClusterState.Builder.toBytes(localClusterState);
+            boolean getResolvedAddress = InetSocketTransportAddress.getResolveAddress();
+            try {
+                InetSocketTransportAddress.setResolveAddress(false);
+                ClusterState masterClusterState = client().admin().cluster().prepareState().all().get().getState();
+                byte[] masterClusterStateBytes = ClusterState.Builder.toBytes(masterClusterState);
                 // remove local node reference
-                localClusterState = ClusterState.Builder.fromBytes(localClusterStateBytes, null);
-                Map<String, Object> localStateMap = convertToMap(localClusterState);
-                int localClusterStateSize = localClusterStateBytes.length;
-                if (masterClusterState.version() == localClusterState.version()) {
-                    try {
-                        assertThat(masterClusterState.uuid(), equalTo(localClusterState.uuid()));
-                        // We cannot compare serialization bytes since serialization order of maps is not guaranteed
-                        // but we can compare serialization sizes - they should be the same
-                        assertThat(masterClusterStateSize, equalTo(localClusterStateSize));
-                        // Compare JSON serialization
-                        assertThat(mapsEqualIgnoringArrayOrder(masterStateMap, localStateMap), equalTo(true));
-                    } catch (AssertionError error) {
-                        logger.error("Cluster state from master:\n{}\nLocal cluster state:\n{}", masterClusterState.toString(), localClusterState.toString());
-                        throw error;
+                masterClusterState = ClusterState.Builder.fromBytes(masterClusterStateBytes, null);
+                Map<String, Object> masterStateMap = convertToMap(masterClusterState);
+                int masterClusterStateSize = ClusterState.Builder.toBytes(masterClusterState).length;
+                for (Client client : cluster()) {
+                    ClusterState localClusterState = client.admin().cluster().prepareState().all().setLocal(true).get().getState();
+                    byte[] localClusterStateBytes = ClusterState.Builder.toBytes(localClusterState);
+                    // remove local node reference
+                    localClusterState = ClusterState.Builder.fromBytes(localClusterStateBytes, null);
+                    Map<String, Object> localStateMap = convertToMap(localClusterState);
+                    int localClusterStateSize = localClusterStateBytes.length;
+                    if (masterClusterState.version() == localClusterState.version()) {
+                        try {
+                            assertThat(masterClusterState.uuid(), equalTo(localClusterState.uuid()));
+                            // We cannot compare serialization bytes since serialization order of maps is not guaranteed
+                            // but we can compare serialization sizes - they should be the same
+                            assertThat(masterClusterStateSize, equalTo(localClusterStateSize));
+                            // Compare JSON serialization
+                            assertThat(mapsEqualIgnoringArrayOrder(masterStateMap, localStateMap), equalTo(true));
+                        } catch (AssertionError error) {
+                            logger.error("Cluster state from master:\n{}\nLocal cluster state:\n{}", masterClusterState.toString(), localClusterState.toString());
+                            throw error;
+                        }
                     }
                 }
+            } finally {
+                InetSocketTransportAddress.setResolveAddress(getResolvedAddress);
             }
         }
+
     }
 
     /**