Merge branch 'main' into Fix_range_handling_zero_length_blob

Author: nicktindall

docs/changelog/126077.yaml

@@ -0,0 +1,6 @@
+pr: 126077
+summary: Preventing `ConcurrentModificationException` when updating settings for more
+  than one index
+area: Indices APIs
+type: bug
+issues: []

muted-tests.yml

@@ -395,6 +395,9 @@ tests:
 - class: org.elasticsearch.xpack.security.authz.RBACEngineTests
   method: testGetRoleDescriptorsIntersectionForRemoteClusterHasDeterministicOrderForIndicesPrivileges
   issue: https://github.com/elastic/elasticsearch/issues/126061
+- class: org.elasticsearch.search.CCSDuelIT
+  method: testTerminateAfter
+  issue: https://github.com/elastic/elasticsearch/issues/126085
 
 # Examples:
 #

server/src/internalClusterTest/java/org/elasticsearch/cluster/metadata/MetadataUpdateSettingsServiceIT.java

@@ -39,7 +39,8 @@ public void testThatNonDynamicSettingChangesTakeEffect() throws Exception {
          * This test makes sure that when non-dynamic settings are updated that they actually take effect (as opposed to just being set
          * in the cluster state).
          */
-        createIndex("test", Settings.EMPTY);
+        createIndex("test-1", Settings.EMPTY);
+        createIndex("test-2", Settings.EMPTY);
         MetadataUpdateSettingsService metadataUpdateSettingsService = internalCluster().getCurrentMasterNodeInstance(
             MetadataUpdateSettingsService.class
         );

server/src/main/java/org/elasticsearch/cluster/metadata/MetadataUpdateSettingsService.java

@@ -219,7 +219,7 @@ ClusterState execute(ClusterState currentState) {
                     // We have non-dynamic settings and open indices. We will unassign all of the shards in these indices so that the new
                     // changed settings are applied when the shards are re-assigned.
                     routingTableBuilder = RoutingTable.builder(allocationService.getShardRoutingRoleStrategy(), currentRoutingTable);
-                    for (Index index : openIndices) {
+                    for (Index index : new HashSet<>(openIndices)) {
                         // We only want to take on the expense of reopening all shards for an index if the setting is really changing
                         Settings existingSettings = currentProject.index(index).getSettings();
                         boolean needToReopenIndex = false;