Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 836e8f3e6 -> 94a80974d


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

Branch: refs/heads/branch-2.8
Commit: 94a80974d39a7a3b86192d8819285275f3c9da37
Parents: 836e8f3
Author: Yiqun Lin <[email protected]>
Authored: Mon Feb 6 13:15:16 2017 +0800
Committer: Konstantin V Shvachko <[email protected]>
Committed: Mon May 22 17:11:52 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/94a80974/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 16f535e..36aef8e 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
@@ -1032,6 +1031,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]

Reply via email to