From 5ed106a79b278052842865d2e63c4817230af7ab Mon Sep 17 00:00:00 2001
From: Artem Prigoda <artem.prigoda@elastic.co>
Date: Tue, 3 Dec 2024 16:16:03 +0100
Subject: [PATCH] [test] Remove synchronization from
 InternalTestCluster#getInstance (#117780)

The map of nodes is volatile and immutable and can be ready without
synchronization. Getting a class's instance from the node's injector
is also thread safe.

Doing so prevents deadlocks if we restart the node and have a disruption
scheme that internally calls `getInstance` from another thread.

```
  2> "elasticsearch[StatelessClusterIntegrityStressIT][server][T#1]" ID=3490 BLOCKED on org.elasticsearch.test.InternalTestCluster@18a6d098 owned by "elasticsearch[StatelessClusterIntegrityStressIT][server][T#2]" ID=3492
  2> 	at app//org.elasticsearch.test.InternalTestCluster.getInstance(InternalTestCluster.java:1653)
  2> 	- blocked on org.elasticsearch.test.InternalTestCluster@18a6d098
  2> 	at app//org.elasticsearch.test.InternalTestCluster.getInstance(InternalTestCluster.java:1620)
  2> 	at app//org.elasticsearch.test.disruption.NetworkDisruption.transport(NetworkDisruption.java:172)
  2> 	at app//org.elasticsearch.test.disruption.NetworkDisruption.applyToNodes(NetworkDisruption.java:157)
  2> 	at app//org.elasticsearch.test.disruption.Net  2> workDisruption.startDisrupting(NetworkDisruption.java:133)

 2> "elasticsearch[StatelessClusterIntegrityStressIT][server][T#2]" ID=3492 BLOCKED on org.elasticsearch.test.disruption.NetworkDisruption@60fd3a1e owned by "elasticsearch[StatelessClusterIntegrityStressIT][server][T#1]" ID=3490
   2> 	at app//org.elasticsearch.test.disruption.NetworkDisruption.applyToNode(NetworkDisruption.java:116)
   2> 	- blocked on org.elasticsearch.test.disruption.NetworkDisruption@60fd3a1e
   2> 	at app//org.elasticsearch.test.InternalTestCluster.applyDisruptionSchemeToNode(InternalTestCluster.java:2307)
   2> 	at app//org.elasticsearch.test.InternalTestCluster.publishNode(InternalTestCluster.java:2258)
   2> 	- locked org.elasticsearch.test.InternalTestCluster@18a6d098
   2> 	at app//org.elasticsearch.test.InternalTestCluster.restartNode(InternalTestCluster.java:1901)
   2> 	at app//org.elasticsearch.test.InternalTestCluster.restartNode(InternalTestCluster.java:1863)
   2> 	- locked org.elasticsearch.test.InternalTestCluster@18a6d098
 ```
---
 .../main/java/org/elasticsearch/test/InternalTestCluster.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
index 7a04384298933..6d46605e201f9 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
@@ -1649,7 +1649,7 @@ public <T> T getAnyMasterNodeInstance(Class<T> clazz) {
         return getInstance(clazz, MASTER_NODE_PREDICATE);
     }
 
-    private synchronized <T> T getInstance(Class<T> clazz, Predicate<NodeAndClient> predicate) {
+    private <T> T getInstance(Class<T> clazz, Predicate<NodeAndClient> predicate) {
         NodeAndClient randomNodeAndClient = getRandomNodeAndClient(predicate);
         if (randomNodeAndClient == null) {
             throw new AssertionError("no node matches [" + predicate + "]");