Author: todd Date: Fri Aug 26 06:45:26 2011 New Revision: 1162004 URL: http://svn.apache.org/viewvc?rev=1162004&view=rev Log: HDFS-2286. DataXceiverServer logs AsynchronousCloseException at shutdown. Contributed by Todd Lipcon.
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1162004&r1=1162003&r2=1162004&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Aug 26 06:45:26 2011 @@ -992,6 +992,9 @@ Release 0.23.0 - Unreleased HDFS-1480. All replicas of a block can end up on the same rack when some datanodes are decommissioning. (todd) + HDFS-2286. DataXceiverServer logs AsynchronousCloseException at shutdown + (todd) + BREAKDOWN OF HDFS-1073 SUBTASKS HDFS-1521. Persist transaction ID on disk between NN restarts. Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java?rev=1162004&r1=1162003&r2=1162004&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java Fri Aug 26 06:45:26 2011 @@ -21,6 +21,7 @@ import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketTimeoutException; +import java.nio.channels.AsynchronousCloseException; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -144,6 +145,12 @@ class DataXceiverServer implements Runna new Daemon(datanode.threadGroup, exciver).start(); } catch (SocketTimeoutException ignored) { // wake up to see if should continue to run + } catch (AsynchronousCloseException ace) { + // another thread closed our listener socket - that's expected during shutdown, + // but not in other circumstances + if (datanode.shouldRun) { + LOG.warn(datanode.getMachineName() + ":DataXceiverServer: ", ace); + } } catch (IOException ie) { LOG.warn(datanode.getMachineName() + ":DataXceiverServer: ", ie); } catch (Throwable te) {