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 ki...@apache.org on 2016/10/20 16:10:05 UTC
hadoop git commit: HDFS-10627. Volume Scanner marks a block as
"suspect" even if the exception is network-related. Contributed by Rushabh S
Shah. Updated CHANGES.txt (cherry picked from commit
5c0bffddc0cb824a8a2751bcd0dc3e15ce081727)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 1e5c40b5b -> 6ae7b9f80
HDFS-10627. Volume Scanner marks a block as "suspect" even if the exception is network-related. Contributed by Rushabh S Shah.
Updated CHANGES.txt
(cherry picked from commit 5c0bffddc0cb824a8a2751bcd0dc3e15ce081727)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6ae7b9f8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6ae7b9f8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6ae7b9f8
Branch: refs/heads/branch-2.7
Commit: 6ae7b9f800f6d349cfeef50950d4eb72d1c1709f
Parents: 1e5c40b
Author: Kihwal Lee <ki...@apache.org>
Authored: Thu Oct 20 11:09:20 2016 -0500
Committer: Kihwal Lee <ki...@apache.org>
Committed: Thu Oct 20 11:09:20 2016 -0500
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6ae7b9f8/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 b19863b..b3eaf6a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -172,6 +172,9 @@ Release 2.7.4 - UNRELEASED
HDFS-9444. Add utility to find set of available ephemeral ports to
ServerSocketUtil. (Masatake Iwasaki via Brahma Reddy Battula)
+ HDFS-10627. Volume Scanner marks a block as "suspect" even if
+ the exception is network-related. (Rushabh S Shah via kihwal)
+
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6ae7b9f8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
index 80061d3..82fea00 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
@@ -613,10 +613,10 @@ class BlockSender implements java.io.Closeable {
String ioem = e.getMessage();
if (!ioem.startsWith("Broken pipe") && !ioem.startsWith("Connection reset")) {
LOG.error("BlockSender.sendChunks() exception: ", e);
- }
- datanode.getBlockScanner().markSuspectBlock(
+ datanode.getBlockScanner().markSuspectBlock(
volumeRef.getVolume().getStorageID(),
block);
+ }
}
throw ioeToSocketException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org