andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#1310] Fix deadlock which can happen if limit of MemoryAwareThreadPoolExecutor was exceed and a close is triggered by a write

Browse Source 
* Close must be handled from outside the write lock to fix a possible deadlock
  which can happen when MemoryAwareThreadPoolExecutor is used and the limit is exceed
  and a close is triggered while the lock is hold. This is because the close(..)
  may try to submit a task to handle it via the ExecutorHandler which then deadlocks.
This commit is contained in:
Norman Maurer 2013-05-06 12:45:13 +02:00
parent 3371f4693b
commit 960067c78a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java
View File

@ -250,8 +250,12 @@ abstract class AbstractNioWorker extends AbstractNioSelector implements Worker {
fireExceptionCaughtLater(channel, t);
}
if (t instanceof IOException) {
// close must be handled from outside the write lock to fix a possible deadlock
// which can happen when MemoryAwareThreadPoolExecutor is used and the limit is exceed
// and a close is triggered while the lock is hold. This is because the close(..)
// may try to submit a task to handle it via the ExecutorHandler which then deadlocks.
// See #1310
open = false;
close(channel, succeededFuture(channel));
}
}
}
@ -269,6 +273,9 @@ abstract class AbstractNioWorker extends AbstractNioSelector implements Worker {
} else if (removeOpWrite) {
clearOpWrite(channel);
}
} else {
// close the channel now
close(channel, succeededFuture(channel));
}
}
if (iothread) {