HDFS-4937. ReplicationMonitor can infinite-loop in BlockPlacementPolicyDefault#chooseRandom(). Contributed by Kihwal Lee.
This commit is contained in:
parent
ce31b22739
commit
43539b5ff4
@ -2201,6 +2201,9 @@ Release 2.8.0 - UNRELEASED
|
|||||||
HDFS-9332. Fix Precondition failures from NameNodeEditLogRoller while
|
HDFS-9332. Fix Precondition failures from NameNodeEditLogRoller while
|
||||||
saving namespace. (wang)
|
saving namespace. (wang)
|
||||||
|
|
||||||
|
HDFS-4937. ReplicationMonitor can infinite-loop in
|
||||||
|
BlockPlacementPolicyDefault#chooseRandom() (kihwal)
|
||||||
|
|
||||||
Release 2.7.2 - UNRELEASED
|
Release 2.7.2 - UNRELEASED
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
@ -659,6 +659,7 @@ protected DatanodeStorageInfo chooseRandom(int numOfReplicas,
|
|||||||
|
|
||||||
int numOfAvailableNodes = clusterMap.countNumOfAvailableNodes(
|
int numOfAvailableNodes = clusterMap.countNumOfAvailableNodes(
|
||||||
scope, excludedNodes);
|
scope, excludedNodes);
|
||||||
|
int refreshCounter = numOfAvailableNodes;
|
||||||
StringBuilder builder = null;
|
StringBuilder builder = null;
|
||||||
if (LOG.isDebugEnabled()) {
|
if (LOG.isDebugEnabled()) {
|
||||||
builder = debugLoggingBuilder.get();
|
builder = debugLoggingBuilder.get();
|
||||||
@ -708,6 +709,17 @@ protected DatanodeStorageInfo chooseRandom(int numOfReplicas,
|
|||||||
// If no candidate storage was found on this DN then set badTarget.
|
// If no candidate storage was found on this DN then set badTarget.
|
||||||
badTarget = (storage == null);
|
badTarget = (storage == null);
|
||||||
}
|
}
|
||||||
|
// Refresh the node count. If the live node count became smaller,
|
||||||
|
// but it is not reflected in this loop, it may loop forever in case
|
||||||
|
// the replicas/rack cannot be satisfied.
|
||||||
|
if (--refreshCounter == 0) {
|
||||||
|
refreshCounter = clusterMap.countNumOfAvailableNodes(scope,
|
||||||
|
excludedNodes);
|
||||||
|
// It has already gone through enough number of nodes.
|
||||||
|
if (refreshCounter <= excludedNodes.size()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (numOfReplicas>0) {
|
if (numOfReplicas>0) {
|
||||||
|
Loading…
Reference in New Issue
Block a user