Test/107515 RestoreTemplateWithMatchOnlyTextMapperIT

docs/changelog/120392.yaml

@@ -0,0 +1,6 @@
+pr: 120392
+summary: Test/107515 restore template with match only text mapper it fail
+area: Search
+type: bug
+issues:
+ - 107515

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamsSnapshotsIT.java

@@ -1095,11 +1095,8 @@ public void testPartialRestoreSnapshotThatIncludesDataStream() {
 
     /**
      * This test is a copy of the {@link #testPartialRestoreSnapshotThatIncludesDataStream()} the only difference
-     * is that one include the global state and one doesn't. In general this shouldn't matter that's why it used to be
-     * a random parameter of the test, but because of #107515 it fails when we include the global state. Keep them
-     * separate until this is fixed.
+     * is that one include the global state and one doesn't.
      */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107515")
     public void testPartialRestoreSnapshotThatIncludesDataStreamWithGlobalState() {
         final String snapshot = "test-snapshot";
         final String indexWithoutDataStream = "test-idx-no-ds";
@@ -1264,11 +1261,8 @@ public void testExcludeDSFromSnapshotWhenExcludingAnyOfItsIndices() {
 
     /**
      * This test is a copy of the {@link #testExcludeDSFromSnapshotWhenExcludingAnyOfItsIndices()} ()} the only difference
-     * is that one include the global state and one doesn't. In general this shouldn't matter that's why it used to be
-     * a random parameter of the test, but because of #107515 it fails when we include the global state. Keep them
-     * separate until this is fixed.
+     * is that one include the global state and one doesn't.
      */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107515")
     public void testExcludeDSFromSnapshotWhenExcludingItsIndicesWithGlobalState() {
         final String snapshot = "test-snapshot";
         final String indexWithoutDataStream = "test-idx-no-ds";
@@ -1434,10 +1428,6 @@ public void testWarningHeaderAbsentOnRestoreWithTemplates() throws Exception {
 
     }
 
-    /**
-     * This test is muted as it's awaiting the same fix as {@link #testPartialRestoreSnapshotThatIncludesDataStreamWithGlobalState()}
-     */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107515")
     public void testWarningHeaderOnRestoreTemplateFromSnapshot() throws Exception {
         String datastreamName = "ds";
 

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

@@ -185,6 +185,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -1243,7 +1244,6 @@ protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry name
                     namedWriteableRegistry
                 );
                 Map<String, Object> masterStateMap = convertToMap(masterClusterState);
-                int masterClusterStateSize = ClusterState.Builder.toBytes(masterClusterState).length;
                 String masterId = masterClusterState.nodes().getMasterNodeId();
                 for (SubscribableListener<ClusterStateResponse> localStateListener : localStates) {
                     localStateListener.andThenAccept(localClusterStateResponse -> {
@@ -1255,7 +1255,6 @@ protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry name
                             namedWriteableRegistry
                         );
                         final Map<String, Object> localStateMap = convertToMap(localClusterState);
-                        final int localClusterStateSize = ClusterState.Builder.toBytes(localClusterState).length;
                         // Check that the non-master node has the same version of the cluster state as the master and
                         // that the master node matches the master (otherwise there is no requirement for the cluster state to
                         // match)
@@ -1268,8 +1267,12 @@ protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry name
                                     localClusterState.stateUUID()
                                 );
                                 // We cannot compare serialization bytes since serialization order of maps is not guaranteed
-                                // but we can compare serialization sizes - they should be the same
-                                assertEquals("cluster state size does not match", masterClusterStateSize, localClusterStateSize);
+                                // but we can compare if the Strings are identical by "counting" the characters
+                                assertTrue(
+                                    "cluster states must be equal",
+                                    equal(masterClusterState.toString(), localClusterState.toString())
+                                );
+
                                 // Compare JSON serialization
                                 assertNull(
                                     "cluster state JSON serialization does not match",
@@ -1291,6 +1294,22 @@ protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry name
         safeGet(future);
     }
 
+    private static boolean equal(String str1, String str2) {
+        if (str1.length() != str2.length()) return false;
+
+        Map<Character, Integer> charCount = new HashMap<>();
+        str1.chars().mapToObj(c -> (char) c).forEach(c -> charCount.put(c, charCount.getOrDefault(c, 0) + 1));
+
+        str2.chars().mapToObj(c -> (char) c).forEach(c -> {
+            charCount.put(c, charCount.getOrDefault(c, 0) - 1);
+            if (charCount.get(c) == 0) {
+                charCount.remove(c);
+            }
+        });
+
+        return charCount.isEmpty();
+    }
+
     protected void ensureClusterStateCanBeReadByNodeTool() throws IOException {
         if (cluster() != null && cluster().size() > 0) {
             final Client masterClient = client();