backport code (#127451)

drempapis · web-flow · commit c428c19aa747 · 2025-04-28T18:06:10.000+10:00
This is a backport of [116126](#116126) [ [122598](#122598) ] closes [126753](#126753
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -188,8 +188,6 @@ tests:
 - class: org.elasticsearch.reservedstate.service.FileSettingsServiceTests
   method: testProcessFileChanges
   issue: https://github.com/elastic/elasticsearch/issues/115280
-- class: org.elasticsearch.indices.mapping.UpdateMappingIntegrationIT
-  issue: https://github.com/elastic/elasticsearch/issues/116126
 - class: org.elasticsearch.upgrades.FullClusterRestartIT
   method: testSnapshotRestore {cluster=OLD}
   issue: https://github.com/elastic/elasticsearch/issues/111777
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
@@ -1759,7 +1759,7 @@ public void indexRandom(boolean forceRefresh, boolean dummyDocuments, boolean ma
             }
         }
         for (CountDownLatch operation : inFlightAsyncOperations) {
-            safeAwait(operation);
+            safeAwait(operation, TEST_REQUEST_TIMEOUT);
         }
         if (bogusIds.isEmpty() == false) {
             // delete the bogus types again - it might trigger merges or at least holes in the segments and enforces deleted docs!

Original file line number	Diff line number	Diff line change
`@@ -1759,7 +1759,7 @@ public void indexRandom(boolean forceRefresh, boolean dummyDocuments, boolean ma`
`1759`	`1759`	`}`
`1760`	`1760`	`}`
`1761`	`1761`	`for (CountDownLatch operation : inFlightAsyncOperations) {`
`1762`		`- safeAwait(operation);`
	`1762`	`+ safeAwait(operation, TEST_REQUEST_TIMEOUT);`
`1763`	`1763`	`}`
`1764`	`1764`	`if (bogusIds.isEmpty() == false) {`
`1765`	`1765`	`// delete the bogus types again - it might trigger merges or at least holes in the segments and enforces deleted docs!`