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 ki...@apache.org on 2016/08/03 17:17:25 UTC
hadoop git commit: HDFS-742. A down DataNode makes Balancer to hang
on repeatingly asking NameNode its partial block list. Contributed by Mit
Desai.
Repository: hadoop
Updated Branches:
refs/heads/trunk bebf10d24 -> 58db263e9
HDFS-742. A down DataNode makes Balancer to hang on repeatingly asking NameNode its partial block list. Contributed by Mit Desai.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58db263e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58db263e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58db263e
Branch: refs/heads/trunk
Commit: 58db263e93daf08280e6a586a10cebd6122cf72a
Parents: bebf10d
Author: Kihwal Lee <ki...@apache.org>
Authored: Wed Aug 3 12:14:59 2016 -0500
Committer: Kihwal Lee <ki...@apache.org>
Committed: Wed Aug 3 12:14:59 2016 -0500
----------------------------------------------------------------------
.../hadoop/hdfs/server/balancer/Dispatcher.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/58db263e/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 9f9cdc0..16e42e0 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
@@ -849,6 +849,13 @@ public class Dispatcher {
+ ", scheduledSize=" + getScheduledSize()
+ ", srcBlocks#=" + srcBlocks.size());
}
+ // check if time is up or not
+ if (Time.monotonicNow() - startTime > MAX_ITERATION_TIME) {
+ LOG.info("Time up (max time=" + MAX_ITERATION_TIME/1000
+ + " seconds). Skipping " + this);
+ isTimeUp = true;
+ continue;
+ }
final PendingMove p = chooseNextMove();
if (p != null) {
// Reset no pending move counter
@@ -886,14 +893,6 @@ public class Dispatcher {
}
}
- // check if time is up or not
- if (Time.monotonicNow() - startTime > MAX_ITERATION_TIME) {
- LOG.info("Time up (max time=" + MAX_ITERATION_TIME/1000
- + " seconds). Skipping " + this);
- isTimeUp = true;
- continue;
- }
-
// Now we can not schedule any block to move and there are
// no new blocks added to the source block list, so we wait.
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org