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 ar...@apache.org on 2014/09/12 20:47:06 UTC
[23/41] git commit: HDFS-6621. Hadoop Balancer prematurely exits
iterations. Contributed by Rafal Wodjdyla and Benjamin Bowman.
HDFS-6621. Hadoop Balancer prematurely exits iterations. Contributed by Rafal Wodjdyla and Benjamin Bowman.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d1dab6cc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d1dab6cc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d1dab6cc
Branch: refs/heads/HDFS-6581
Commit: d1dab6cc63abf5d44533ad9b39e32c582327627b
Parents: bf64fce
Author: Andrew Wang <wa...@apache.org>
Authored: Thu Sep 11 10:32:20 2014 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Thu Sep 11 10:32:20 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/d1dab6cc/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 266937d..cfa9344 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -638,6 +638,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/d1dab6cc/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