HDFS-742. A down DataNode makes Balancer to hang on repeatingly asking NameNode its partial block list. Contributed by Mit Desai.

(cherry picked from commit 58db263e93)
This commit is contained in:
Kihwal Lee 2016-08-03 12:18:15 -05:00
parent ab7072838f
commit c15959fa60
1 changed files with 7 additions and 8 deletions

View File

@ -788,6 +788,13 @@ public class Dispatcher {
+ ", scheduledSize=" + getScheduledSize() + ", scheduledSize=" + getScheduledSize()
+ ", srcBlocks#=" + srcBlocks.size()); + ", 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(); final PendingMove p = chooseNextMove();
if (p != null) { if (p != null) {
// Reset no pending move counter // Reset no pending move counter
@ -825,14 +832,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 // Now we can not schedule any block to move and there are
// no new blocks added to the source block list, so we wait. // no new blocks added to the source block list, so we wait.
try { try {