honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-01 08:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

better to close the channels on another thread as well, just to be safe

Browse Source
This commit is contained in:
kimchy 2011-02-01 23:08:52 +02:00
parent 8587f16119
commit eb1db1140b
1 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java
View File

@ -302,61 +302,55 @@ public class NettyTransport extends AbstractLifecycleComponent<Transport> implem
}
@Override protected void doStop() throws ElasticSearchException {
if (serverChannel != null) {
try {
serverChannel.close().awaitUninterruptibly();
} finally {
serverChannel = null;
}
}
final CountDownLatch latch = new CountDownLatch(1);
// make sure we run it on another thread than a possible IO handler thread
threadPool.cached().execute(new Runnable() {
@Override public void run() {
try {
for (Iterator<NodeChannels> it = connectedNodes.values().iterator(); it.hasNext();) {
NodeChannels nodeChannels = it.next();
it.remove();
nodeChannels.close();
}
if (serverOpenChannels != null) {
serverOpenChannels.close();
serverOpenChannels = null;
}
if (serverChannel != null) {
try {
serverChannel.close().awaitUninterruptibly();
} finally {
serverChannel = null;
}
}
if (serverBootstrap != null) {
final CountDownLatch latch = new CountDownLatch(1);
threadPool.cached().execute(new Runnable() {
@Override public void run() {
try {
if (serverOpenChannels != null) {
serverOpenChannels.close();
serverOpenChannels = null;
}
if (serverBootstrap != null) {
serverBootstrap.releaseExternalResources();
} finally {
latch.countDown();
serverBootstrap = null;
}
}
});
try {
latch.await(30, TimeUnit.SECONDS);
} catch (InterruptedException e) {
// ignore
}
serverBootstrap = null;
}
for (Iterator<NodeChannels> it = connectedNodes.values().iterator(); it.hasNext();) {
NodeChannels nodeChannels = it.next();
it.remove();
nodeChannels.close();
}
for (Iterator<NodeChannels> it = connectedNodes.values().iterator(); it.hasNext();) {
NodeChannels nodeChannels = it.next();
it.remove();
nodeChannels.close();
}
if (clientBootstrap != null) {
final CountDownLatch latch = new CountDownLatch(1);
threadPool.cached().execute(new Runnable() {
@Override public void run() {
try {
if (clientBootstrap != null) {
clientBootstrap.releaseExternalResources();
} finally {
latch.countDown();
clientBootstrap = null;
}
} finally {
latch.countDown();
}
});
try {
latch.await(30, TimeUnit.SECONDS);
} catch (InterruptedException e) {
// ignore
}
clientBootstrap = null;
});
try {
latch.await(30, TimeUnit.SECONDS);
} catch (InterruptedException e) {
// ignore
}
}