hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject git commit: HDFS-6621. Hadoop Balancer prematurely exits iterations. Contributed by Rafal Wodjdyla and Benjamin Bowman.
Date Thu, 11 Sep 2014 17:33:14 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 0fae8a0e1 -> c90e15c55


HDFS-6621. Hadoop Balancer prematurely exits iterations. Contributed by Rafal Wodjdyla and
Benjamin Bowman.

(cherry picked from commit d1dab6cc63abf5d44533ad9b39e32c582327627b)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c90e15c5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c90e15c5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c90e15c5

Branch: refs/heads/branch-2
Commit: c90e15c55925aef0bb020bad446261fdb855d36f
Parents: 0fae8a0
Author: Andrew Wang <wang@apache.org>
Authored: Thu Sep 11 10:32:20 2014 -0700
Committer: Andrew Wang <wang@apache.org>
Committed: Thu Sep 11 10:32:57 2014 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                       | 3 +++
 .../java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java   | 2 ++
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c90e15c5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index afdbb04..3b3a723 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -380,6 +380,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-6966. Add additional unit tests for encryption zones.
     (Stephen Chu via wang)
 
+    HDFS-6621. Hadoop Balancer prematurely exits iterations.
+    (Rafal Wojdyla and Benjamin Bowman via wang)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HDFS-6387. HDFS CLI admin tool for creating & deleting an

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c90e15c5/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 b7dceb6..14d5989 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
@@ -654,6 +654,8 @@ public class Dispatcher {
           && (!srcBlocks.isEmpty() || blocksToReceive > 0)) {
         final PendingMove p = chooseNextMove();
         if (p != null) {
+          // Reset no pending move counter
+          noPendingMoveIteration=0;
           // move the block
           moveExecutor.execute(new Runnable() {
             @Override


Mime
View raw message