This is an automated email from the ASF dual-hosted git repository.
kihwal pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 95a70c0 HDFS-16127. Improper pipeline close recovery causes a
permanent write failure or data loss. Contributed by Kihwal Lee.
95a70c0 is described below
commit 95a70c0fdfb2a2534a54d01012c49d4ff23117f6
Author: Kihwal Lee <kih...@apache.org>
AuthorDate: Fri Jul 16 14:23:36 2021 -0500
HDFS-16127. Improper pipeline close recovery causes a permanent write
failure or data loss. Contributed by Kihwal Lee.
(cherry picked from commit 47002719f2aa4ff58378d528d38b0f0962a45c25)
---
.../src/main/java/org/apache/hadoop/hdfs/DataStreamer.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
index 110261b..e1d104e 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
@@ -778,7 +778,19 @@ class DataStreamer extends Daemon {
// Is this block full?
if (one.isLastPacketInBlock()) {
// wait for the close packet has been acked
- waitForAllAcks();
+ try {
+ waitForAllAcks();
+ } catch (IOException ioe) {
+ // No need to do a close recovery if the last packet was acked.
+ // i.e. ackQueue is empty. waitForAllAcks() can get an exception
+ // (e.g. connection reset) while sending a heartbeat packet,
+ // if the DN sends the final ack and closes the connection.
+ synchronized (dataQueue) {
+ if (!ackQueue.isEmpty()) {
+ throw ioe;
+ }
+ }
+ }
if (shouldStop()) {
continue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
