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 sh...@apache.org on 2017/05/23 00:56:33 UTC

hadoop git commit: HDFS-11377. Balancer hung due to no available mover threads. Contributed by yunjiong zhao.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 e9575d7da -> f46781261


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/f4678126
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f4678126
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f4678126

Branch: refs/heads/branch-2.7
Commit: f46781261f45fdb0e11d509bd136c53482f25baa
Parents: e9575d7
Author: Yiqun Lin <yq...@apache.org>
Authored: Mon Feb 6 13:15:16 2017 +0800
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Mon May 22 17:44:12 2017 -0700

----------------------------------------------------------------------
 .../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/f4678126/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 cb55d6a..75c32f9 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
@@ -86,7 +86,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
@@ -1007,6 +1006,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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org