honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TransportService should capture listener before spawning background notification task 

Not doing this made it difficult to establish a happens before relationship between connecting to a node and adding a listeners. Causing test code like this to fail sproadically:

```
        // connection to reuse
        handleA.transportService.connectToNode(handleB.node);

        // install a listener to check that no new connections are made
        handleA.transportService.addConnectionListener(new TransportConnectionListener() {
            @Override
            public void onConnectionOpened(DiscoveryNode node) {
                fail("should not open any connections. got [" + node + "]");
            }
        });

```

relates to #22277
This commit is contained in:
Boaz Leskes 2016-12-23 13:40:54 +01:00
parent ddf4a463f3
commit c2baa5f213
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/org/elasticsearch/transport/TransportService.java
View File

@ -64,6 +64,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Stream;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static org.elasticsearch.common.settings.Setting.listSetting; import static org.elasticsearch.common.settings.Setting.listSetting;
@ -807,20 +808,20 @@ public class TransportService extends AbstractLifecycleComponent {
@Override @Override
public void onNodeConnected(final DiscoveryNode node) { public void onNodeConnected(final DiscoveryNode node) {
threadPool.generic().execute(() -> { // capture listeners before spawning the background callback so the following pattern won't trigger a call
for (TransportConnectionListener connectionListener : connectionListeners) { // connectToNode(); connection is completed successfully
connectionListener.onNodeConnected(node); // addConnectionListener(); this listener shouldn't be called
} final Stream<TransportConnectionListener> listenersToNotify = TransportService.this.connectionListeners.stream();
}); threadPool.generic().execute(() -> listenersToNotify.forEach(listener -> listener.onNodeConnected(node)));
} }
@Override @Override
public void onConnectionOpened(DiscoveryNode node) { public void onConnectionOpened(DiscoveryNode node) {
threadPool.generic().execute(() -> { // capture listeners before spawning the background callback so the following pattern won't trigger a call
for (TransportConnectionListener connectionListener : connectionListeners) { // connectToNode(); connection is completed successfully
connectionListener.onConnectionOpened(node); // addConnectionListener(); this listener shouldn't be called
} final Stream<TransportConnectionListener> listenersToNotify = TransportService.this.connectionListeners.stream();
}); threadPool.generic().execute(() -> listenersToNotify.forEach(listener -> listener.onConnectionOpened(node)));
} }
@Override @Override

2
core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java
View File

@ -41,7 +41,6 @@ import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.VersionUtils;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.test.transport.MockTransportService;
import org.elasticsearch.threadpool.TestThreadPool; import org.elasticsearch.threadpool.TestThreadPool;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
@ -540,7 +539,6 @@ public class UnicastZenPingTests extends ESTestCase {
} }
} }
@TestLogging("org.elasticsearch:DEBUG,org.elasticsearch.discovery:TRACE,org.elasticsearch.transport:TRACE")
public void testResolveReuseExistingNodeConnections() throws ExecutionException, InterruptedException { public void testResolveReuseExistingNodeConnections() throws ExecutionException, InterruptedException {
final Settings settings = Settings.builder().put("cluster.name", "test").put(TransportSettings.PORT.getKey(), 0).build(); final Settings settings = Settings.builder().put("cluster.name", "test").put(TransportSettings.PORT.getKey(), 0).build();