Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ACFEC11196 for ; Thu, 11 Sep 2014 17:33:13 +0000 (UTC) Received: (qmail 72304 invoked by uid 500); 11 Sep 2014 17:33:13 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 72233 invoked by uid 500); 11 Sep 2014 17:33:13 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 72216 invoked by uid 99); 11 Sep 2014 17:33:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2014 17:33:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E7363917E87; Thu, 11 Sep 2014 17:33:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: <084a26446a1c4c0f8d7fc0b75a15888f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: HDFS-6621. Hadoop Balancer prematurely exits iterations. Contributed by Rafal Wodjdyla and Benjamin Bowman. Date: Thu, 11 Sep 2014 17:33:12 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk bf64fce78 -> d1dab6cc6 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/trunk Commit: d1dab6cc63abf5d44533ad9b39e32c582327627b Parents: bf64fce Author: Andrew Wang Authored: Thu Sep 11 10:32:20 2014 -0700 Committer: Andrew Wang 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