You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2015/12/17 23:10:43 UTC
[2/3] hadoop git commit: HDFS-9572. Prevent DataNode log spam if a
client connects on the data transfer port but sends no data. Contributed by
Chris Nauroth
HDFS-9572. Prevent DataNode log spam if a client connects on the data transfer port but sends no data. Contributed by Chris Nauroth
(cherry picked from commit 03bab8dea163a9ee45d09d2a0483d45cf6fe57c9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/294d0f6f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/294d0f6f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/294d0f6f
Branch: refs/heads/branch-2
Commit: 294d0f6f6a90926f23cbcf8006cbc893bdb488e6
Parents: c0733db
Author: cnauroth <cn...@apache.org>
Authored: Thu Dec 17 14:04:45 2015 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Thu Dec 17 14:05:05 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop/hdfs/server/datanode/DataXceiver.java | 19 ++++++++-----------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/294d0f6f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 844f867..db4f565 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1648,6 +1648,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9515. NPE when MiniDFSCluster#shutdown is invoked on uninitialized
reference. (Wei-Chiu Chuang via Arpit Agarwal)
+ HDFS-9572. Prevent DataNode log spam if a client connects on the data
+ transfer port but sends no data. (cnauroth)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/294d0f6f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
index 8220d6c..f9c68cd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
@@ -233,18 +233,15 @@ class DataXceiver extends Receiver implements Runnable {
} catch (InterruptedIOException ignored) {
// Time out while we wait for client rpc
break;
- } catch (IOException err) {
- // Since we optimistically expect the next op, it's quite normal to get EOF here.
- if (opsProcessed > 0 &&
- (err instanceof EOFException || err instanceof ClosedChannelException)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cached " + peer + " closing after " + opsProcessed + " ops");
- }
- } else {
- incrDatanodeNetworkErrors();
- throw err;
- }
+ } catch (EOFException | ClosedChannelException e) {
+ // Since we optimistically expect the next op, it's quite normal to
+ // get EOF here.
+ LOG.debug("Cached {} closing after {} ops. " +
+ "This message is usually benign.", peer, opsProcessed);
break;
+ } catch (IOException err) {
+ incrDatanodeNetworkErrors();
+ throw err;
}
// restore normal timeout