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 in...@apache.org on 2018/05/18 18:08:05 UTC
[1/2] hadoop git commit: HDFS-13590. Backport HDFS-12378 to branch-2.
Contributed by Lukas Majercak.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 1af41dadc -> 8f45d119a
refs/heads/branch-2.9 efe4ad00e -> 23e6ddf1c
HDFS-13590. Backport HDFS-12378 to branch-2. Contributed by Lukas Majercak.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8f45d119
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8f45d119
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8f45d119
Branch: refs/heads/branch-2
Commit: 8f45d119a1e587e9bc4ef91796b0690d46b80341
Parents: 1af41da
Author: Inigo Goiri <in...@apache.org>
Authored: Fri May 18 11:07:12 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Fri May 18 11:07:12 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hdfs/server/datanode/DataNode.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f45d119/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index 73d77af..d9655c7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -2920,8 +2920,16 @@ public class DataNode extends ReconfigurableBase
b.setNumBytes(visible);
if (targets.length > 0) {
- new Daemon(new DataTransfer(targets, targetStorageTypes,
- b, stage, client)).start();
+ Daemon daemon = new Daemon(threadGroup,
+ new DataTransfer(targets, targetStorageTypes, b,
+ stage, client));
+ daemon.start();
+ try {
+ daemon.join();
+ } catch (InterruptedException e) {
+ throw new IOException(
+ "Pipeline recovery for " + b + " is interrupted.", e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: HDFS-13590. Backport HDFS-12378 to branch-2.
Contributed by Lukas Majercak.
Posted by in...@apache.org.
HDFS-13590. Backport HDFS-12378 to branch-2. Contributed by Lukas Majercak.
(cherry picked from commit 8f45d119a1e587e9bc4ef91796b0690d46b80341)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/23e6ddf1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/23e6ddf1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/23e6ddf1
Branch: refs/heads/branch-2.9
Commit: 23e6ddf1c5abbe76c610b5c5e5375640ff720ae9
Parents: efe4ad0
Author: Inigo Goiri <in...@apache.org>
Authored: Fri May 18 11:07:12 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Fri May 18 11:07:43 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hdfs/server/datanode/DataNode.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/23e6ddf1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index 73d77af..d9655c7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -2920,8 +2920,16 @@ public class DataNode extends ReconfigurableBase
b.setNumBytes(visible);
if (targets.length > 0) {
- new Daemon(new DataTransfer(targets, targetStorageTypes,
- b, stage, client)).start();
+ Daemon daemon = new Daemon(threadGroup,
+ new DataTransfer(targets, targetStorageTypes, b,
+ stage, client));
+ daemon.start();
+ try {
+ daemon.join();
+ } catch (InterruptedException e) {
+ throw new IOException(
+ "Pipeline recovery for " + b + " is interrupted.", e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org