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

Use a set rather than a list for connected nodes

This commit is contained in:
Simon Willnauer 2017-01-13 12:25:35 +01:00
parent 9c167cc92d
commit e2ebabcb3c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/elasticsearch/action/search/RemoteClusterConnection.java
View File

@ -55,8 +55,10 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionException;
@ -81,7 +83,7 @@ final class RemoteClusterConnection extends AbstractComponent implements Transpo
private final TransportService transportService; private final TransportService transportService;
private final ConnectionProfile remoteProfile; private final ConnectionProfile remoteProfile;
private final CopyOnWriteArrayList<DiscoveryNode> connectedNodes = new CopyOnWriteArrayList<>(); private final Set<DiscoveryNode> connectedNodes = Collections.newSetFromMap(new ConcurrentHashMap<>());
private final Supplier<DiscoveryNode> nodeSupplier; private final Supplier<DiscoveryNode> nodeSupplier;
private final String clusterAlias; private final String clusterAlias;
private final int maxNumRemoteConnections; private final int maxNumRemoteConnections;
@ -410,7 +412,7 @@ final class RemoteClusterConnection extends AbstractComponent implements Transpo
cancellableThreads.cancel("connect handler is closed"); cancellableThreads.cancel("connect handler is closed");
running.acquire(); // acquire the semaphore to ensure all connections are closed and all thread joined running.acquire(); // acquire the semaphore to ensure all connections are closed and all thread joined
running.release(); running.release();
maybeConnect(); // now go an notify pending listeners maybeConnect(); // now go and notify pending listeners
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();