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 ms...@apache.org on 2019/07/10 11:16:09 UTC
[hadoop] branch trunk updated: HDDS-1748. Error message for 3 way
commit failure is not verbose. Contributed by Supratim Deka (#1051)
This is an automated email from the ASF dual-hosted git repository.
msingh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new e0fa104 HDDS-1748. Error message for 3 way commit failure is not verbose. Contributed by Supratim Deka (#1051)
e0fa104 is described below
commit e0fa1040afc4a4683634ca39dd28620408250d01
Author: supratimdeka <46...@users.noreply.github.com>
AuthorDate: Wed Jul 10 16:45:55 2019 +0530
HDDS-1748. Error message for 3 way commit failure is not verbose. Contributed by Supratim Deka (#1051)
---
.../main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java | 7 ++++---
.../java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
index 4a90e48..98cba0b 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
@@ -259,7 +259,7 @@ public final class XceiverClientRatis extends XceiverClientSpi {
replyFuture.get(timeout, TimeUnit.MILLISECONDS);
} catch (Exception e) {
Throwable t = HddsClientUtils.checkForException(e);
- LOG.warn("3 way commit failed ", e);
+ LOG.warn("3 way commit failed on pipeline {}", pipeline, e);
if (t instanceof GroupMismatchException) {
throw e;
}
@@ -278,8 +278,9 @@ public final class XceiverClientRatis extends XceiverClientSpi {
// replication.
commitInfoMap.remove(address);
LOG.info(
- "Could not commit " + index + " to all the nodes. Server " + address
- + " has failed." + " Committed by majority.");
+ "Could not commit index {} on pipeline {} to all the nodes. " +
+ "Server {} has failed. Committed by majority.",
+ index, pipeline, address);
});
}
clientReply.setLogIndex(index);
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
index fc9d404..9e40f3e 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
@@ -356,9 +356,10 @@ public class BlockOutputStream extends OutputStream {
if (reply != null) {
List<DatanodeDetails> dnList = reply.getDatanodes();
if (!dnList.isEmpty()) {
- if (failedServers.isEmpty()) {
- failedServers = new ArrayList<>();
- }
+ Pipeline pipe = xceiverClient.getPipeline();
+
+ LOG.warn("Failed to commit BlockId {} on {}. Failed nodes: {}",
+ blockID, pipe, dnList);
failedServers.addAll(dnList);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org