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 ay...@apache.org on 2023/04/29 12:06:05 UTC
[hadoop] branch branch-3.3 updated (05edfee1f3c -> 6b6bd82bf05)
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
from 05edfee1f3c HADOOP-18399. S3A Prefetch - SingleFilePerBlockCache to use LocalDirAllocator (#5054)
new 408c5c53b10 HDFS-16897. Fix abundant Broken pipe exception in BlockSender (#5329). Contributed by fanluo.
new 6b6bd82bf05 HADOOP-18715. Add debug log for getting details of tokenKindMap (#5608). Contributed by Pralabh Kumar.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/hadoop/security/token/Token.java | 1 +
.../java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: HDFS-16897. Fix abundant Broken pipe exception in BlockSender (#5329). Contributed by fanluo.
Posted by ay...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 408c5c53b10b157aad8b107c343fbd1ebd8f6321
Author: fanluoo <95...@qq.com>
AuthorDate: Sat Apr 29 19:54:56 2023 +0800
HDFS-16897. Fix abundant Broken pipe exception in BlockSender (#5329). Contributed by fanluo.
Signed-off-by: Ayush Saxena <ay...@apache.org>
---
.../java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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 105e1e86c2e..f2724d062ce 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
@@ -653,8 +653,12 @@ class BlockSender implements java.io.Closeable {
if (ioem.startsWith(EIO_ERROR)) {
throw new DiskFileCorruptException("A disk IO error occurred", e);
}
+ String causeMessage = e.getCause() != null ? e.getCause().getMessage() : "";
+ causeMessage = causeMessage != null ? causeMessage : "";
if (!ioem.startsWith("Broken pipe")
- && !ioem.startsWith("Connection reset")) {
+ && !ioem.startsWith("Connection reset")
+ && !causeMessage.startsWith("Broken pipe")
+ && !causeMessage.startsWith("Connection reset")) {
LOG.error("BlockSender.sendChunks() exception: ", e);
datanode.getBlockScanner().markSuspectBlock(
ris.getVolumeRef().getVolume().getStorageID(), block);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: HADOOP-18715. Add debug log for getting details of tokenKindMap (#5608). Contributed by Pralabh Kumar.
Posted by ay...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 6b6bd82bf05c58afe65890d6e00d268623ae7814
Author: Pralabh Kumar <pr...@uber.com>
AuthorDate: Sat Apr 29 17:28:49 2023 +0530
HADOOP-18715. Add debug log for getting details of tokenKindMap (#5608). Contributed by Pralabh Kumar.
Signed-off-by: Ayush Saxena <ay...@apache.org>
---
.../src/main/java/org/apache/hadoop/security/token/Token.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
index 33314060a55..3ea32bc41ed 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
@@ -136,6 +136,7 @@ public class Token<T extends TokenIdentifier> implements Writable {
while (tokenIdentifiers.hasNext()) {
try {
TokenIdentifier id = tokenIdentifiers.next();
+ LOG.debug("Added {}:{} into tokenKindMap", id.getKind(), id.getClass());
tokenKindMap.put(id.getKind(), id.getClass());
} catch (ServiceConfigurationError | LinkageError e) {
// failure to load a token implementation
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org