Repository: hadoop Updated Branches: refs/heads/branch-2 b7d59e790 -> 26bed5ce5
HDFS-11377. Balancer hung due to no available mover threads. Contributed by yunjiong zhao. (cherry picked from commit 9cbbd1eae893b21212c9bc9e6745c6859317a667) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/26bed5ce Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/26bed5ce Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/26bed5ce Branch: refs/heads/branch-2 Commit: 26bed5ce53b7acf888d097d9b78eea28475a62b5 Parents: b7d59e7 Author: Yiqun Lin <[email protected]> Authored: Mon Feb 6 13:15:16 2017 +0800 Committer: Yiqun Lin <[email protected]> Committed: Mon Feb 6 13:18:14 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/26bed5ce/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java index 5ab6778..40036e5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java @@ -85,7 +85,6 @@ import com.google.common.base.Preconditions; public class Dispatcher { static final Log LOG = LogFactory.getLog(Dispatcher.class); - private static final int MAX_NO_PENDING_MOVE_ITERATIONS = 5; /** * the period of time to delay the usage of a DataNode after hitting * errors when using it for migrating data @@ -1015,6 +1014,8 @@ public class Dispatcher { } if (moveExecutor == null) { LOG.warn("No mover threads available: skip moving " + p); + targetDn.removePendingBlock(p); + p.proxySource.removePendingBlock(p); return; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
