Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-10319. Balancer should not try to pair storages with different types.

This commit is contained in:
Tsz-Wo Nicholas Sze 2016-04-21 15:20:12 -07:00
parent b726ae0876
commit 704c57e3eb
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
View File

@ -520,8 +520,7 @@ C chooseCandidate(G g, Iterator<C> candidates, Matcher matcher) {
final C c = candidates.next(); final C c = candidates.next();
if (!c.hasSpaceForScheduling()) { if (!c.hasSpaceForScheduling()) {
candidates.remove(); candidates.remove();
} else if (matcher.match(dispatcher.getCluster(), } else if (matchStorageGroups(c, g, matcher)) {
g.getDatanodeInfo(), c.getDatanodeInfo())) {
return c; return c;
} }
} }
@ -529,6 +528,13 @@ C chooseCandidate(G g, Iterator<C> candidates, Matcher matcher) {
return null; return null;
} }
private boolean matchStorageGroups(StorageGroup left, StorageGroup right,
Matcher matcher) {
return left.getStorageType() == right.getStorageType()
&& matcher.match(dispatcher.getCluster(),
left.getDatanodeInfo(), right.getDatanodeInfo());
}
/* reset all fields in a balancer preparing for the next iteration */ /* reset all fields in a balancer preparing for the next iteration */
void resetData(Configuration conf) { void resetData(Configuration conf) {
this.overUtilized.clear(); this.overUtilized.clear();