This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 0fcbeed HDFS-14836. FileIoProvider should not increase FileIoErrors
metric in datanode volume metric. Contributed by Aiphago.
0fcbeed is described below
commit 0fcbeed49a0251676df3ab2c83b1df434921d851
Author: Wei-Chiu Chuang <weic...@apache.org>
AuthorDate: Wed Sep 18 09:34:01 2019 -0700
HDFS-14836. FileIoProvider should not increase FileIoErrors metric in
datanode volume metric. Contributed by Aiphago.
Reviewed-by: He Xiaoqiao <hexiaoq...@apache.org>
(cherry picked from commit 5dd859a8a0d038ff04acbb96741a215d6a0e8c29)
(cherry picked from commit b906f53b0d0e330d65a36295bfb8fe66d0a3995c)
---
.../java/org/apache/hadoop/hdfs/server/datanode/FileIoProvider.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/FileIoProvider.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/FileIoProvider.java
index b8e08d0..cb2309d 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/FileIoProvider.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/FileIoProvider.java
@@ -281,7 +281,10 @@ public class FileIoProvider {
waitTime, transferTime);
profilingEventHook.afterFileIo(volume, TRANSFER, begin, count);
} catch (Exception e) {
- onFailure(volume, begin);
+ String em = e.getMessage();
+ if (!em.startsWith("Broken pipe") && !em.startsWith("Connection reset"))
{
+ onFailure(volume, begin);
+ }
throw e;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
