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

YARN-10950. Code cleanup in QueueCapacities (#3454)

This commit is contained in:
Adam Antal 2021-09-19 14:42:02 +02:00 committed by GitHub
parent 5dcb23c1f0
commit a9b2469a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueCapacities.java
View File

@ -33,17 +33,16 @@ import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsMana
public class QueueCapacities { public class QueueCapacities {
private static final String NL = CommonNodeLabelsManager.NO_LABEL; private static final String NL = CommonNodeLabelsManager.NO_LABEL;
private static final float LABEL_DOESNT_EXIST_CAP = 0f; private static final float LABEL_DOESNT_EXIST_CAP = 0f;
private Map<String, Capacities> capacitiesMap; private final Map<String, Capacities> capacitiesMap;
private ReadLock readLock; private final ReadLock readLock;
private WriteLock writeLock; private final WriteLock writeLock;
private final boolean isRoot; private final boolean isRoot;
public QueueCapacities(boolean isRoot) { public QueueCapacities(boolean isRoot) {
ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
readLock = lock.readLock(); readLock = lock.readLock();
writeLock = lock.writeLock(); writeLock = lock.writeLock();
capacitiesMap = new HashMap<>();
capacitiesMap = new HashMap<String, Capacities>();
this.isRoot = isRoot; this.isRoot = isRoot;
} }
@ -52,15 +51,15 @@ public class QueueCapacities {
USED_CAP(0), ABS_USED_CAP(1), MAX_CAP(2), ABS_MAX_CAP(3), CAP(4), ABS_CAP(5), USED_CAP(0), ABS_USED_CAP(1), MAX_CAP(2), ABS_MAX_CAP(3), CAP(4), ABS_CAP(5),
MAX_AM_PERC(6), RESERVED_CAP(7), ABS_RESERVED_CAP(8), WEIGHT(9), NORMALIZED_WEIGHT(10); MAX_AM_PERC(6), RESERVED_CAP(7), ABS_RESERVED_CAP(8), WEIGHT(9), NORMALIZED_WEIGHT(10);
private int idx; private final int idx;
private CapacityType(int idx) { CapacityType(int idx) {
this.idx = idx; this.idx = idx;
} }
} }
private static class Capacities { private static class Capacities {
private float[] capacitiesArr; private final float[] capacitiesArr;
public Capacities() { public Capacities() {
capacitiesArr = new float[CapacityType.values().length]; capacitiesArr = new float[CapacityType.values().length];
@ -71,19 +70,17 @@ public class QueueCapacities {
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); return "{used=" + capacitiesArr[0] + "%, " +
sb.append("{used=" + capacitiesArr[0] + "%, ") "abs_used=" + capacitiesArr[1] + "%, " +
.append("abs_used=" + capacitiesArr[1] + "%, ") "max_cap=" + capacitiesArr[2] + "%, " +
.append("max_cap=" + capacitiesArr[2] + "%, ") "abs_max_cap=" + capacitiesArr[3] + "%, " +
.append("abs_max_cap=" + capacitiesArr[3] + "%, ") "cap=" + capacitiesArr[4] + "%, " +
.append("cap=" + capacitiesArr[4] + "%, ") "abs_cap=" + capacitiesArr[5] + "%, " +
.append("abs_cap=" + capacitiesArr[5] + "%, ") "max_am_perc=" + capacitiesArr[6] + "%, " +
.append("max_am_perc=" + capacitiesArr[6] + "%, ") "reserved_cap=" + capacitiesArr[7] + "%, " +
.append("reserved_cap=" + capacitiesArr[7] + "%, ") "abs_reserved_cap=" + capacitiesArr[8] + "%, " +
.append("abs_reserved_cap=" + capacitiesArr[8] + "%, ") "weight=" + capacitiesArr[9] + "w, " +
.append("weight=" + capacitiesArr[9] + "w, ") "normalized_weight=" + capacitiesArr[10] + "w}";
.append("normalized_weight=" + capacitiesArr[10] + "w}");
return sb.toString();
} }
} }
@ -118,7 +115,6 @@ public class QueueCapacities {
} }
} }
/* Used Capacity Getter and Setter */
public float getUsedCapacity() { public float getUsedCapacity() {
return _get(NL, CapacityType.USED_CAP); return _get(NL, CapacityType.USED_CAP);
} }
@ -135,7 +131,6 @@ public class QueueCapacities {
_set(label, CapacityType.USED_CAP, value); _set(label, CapacityType.USED_CAP, value);
} }
/* Absolute Used Capacity Getter and Setter */
public float getAbsoluteUsedCapacity() { public float getAbsoluteUsedCapacity() {
return _get(NL, CapacityType.ABS_USED_CAP); return _get(NL, CapacityType.ABS_USED_CAP);
} }
@ -152,7 +147,6 @@ public class QueueCapacities {
_set(label, CapacityType.ABS_USED_CAP, value); _set(label, CapacityType.ABS_USED_CAP, value);
} }
/* Capacity Getter and Setter */
public float getCapacity() { public float getCapacity() {
return _get(NL, CapacityType.CAP); return _get(NL, CapacityType.CAP);
} }
@ -173,7 +167,6 @@ public class QueueCapacities {
_set(label, CapacityType.CAP, value); _set(label, CapacityType.CAP, value);
} }
/* Absolute Capacity Getter and Setter */
public float getAbsoluteCapacity() { public float getAbsoluteCapacity() {
return _get(NL, CapacityType.ABS_CAP); return _get(NL, CapacityType.ABS_CAP);
} }
@ -193,7 +186,6 @@ public class QueueCapacities {
_set(label, CapacityType.ABS_CAP, value); _set(label, CapacityType.ABS_CAP, value);
} }
/* Maximum Capacity Getter and Setter */
public float getMaximumCapacity() { public float getMaximumCapacity() {
return _get(NL, CapacityType.MAX_CAP); return _get(NL, CapacityType.MAX_CAP);
} }
@ -210,7 +202,6 @@ public class QueueCapacities {
_set(label, CapacityType.MAX_CAP, value); _set(label, CapacityType.MAX_CAP, value);
} }
/* Absolute Maximum Capacity Getter and Setter */
public float getAbsoluteMaximumCapacity() { public float getAbsoluteMaximumCapacity() {
return _get(NL, CapacityType.ABS_MAX_CAP); return _get(NL, CapacityType.ABS_MAX_CAP);
} }
@ -227,8 +218,6 @@ public class QueueCapacities {
_set(label, CapacityType.ABS_MAX_CAP, value); _set(label, CapacityType.ABS_MAX_CAP, value);
} }
/* Absolute Maximum AM resource percentage Getter and Setter */
public float getMaxAMResourcePercentage() { public float getMaxAMResourcePercentage() {
return _get(NL, CapacityType.MAX_AM_PERC); return _get(NL, CapacityType.MAX_AM_PERC);
} }
@ -245,7 +234,6 @@ public class QueueCapacities {
_set(NL, CapacityType.MAX_AM_PERC, value); _set(NL, CapacityType.MAX_AM_PERC, value);
} }
/* Reserved Capacity Getter and Setter */
public float getReservedCapacity() { public float getReservedCapacity() {
return _get(NL, CapacityType.RESERVED_CAP); return _get(NL, CapacityType.RESERVED_CAP);
} }
@ -262,7 +250,6 @@ public class QueueCapacities {
_set(label, CapacityType.RESERVED_CAP, value); _set(label, CapacityType.RESERVED_CAP, value);
} }
/* Absolute Reserved Capacity Getter and Setter */
public float getAbsoluteReservedCapacity() { public float getAbsoluteReservedCapacity() {
return _get(NL, CapacityType.ABS_RESERVED_CAP); return _get(NL, CapacityType.ABS_RESERVED_CAP);
} }
@ -279,7 +266,6 @@ public class QueueCapacities {
_set(label, CapacityType.ABS_RESERVED_CAP, value); _set(label, CapacityType.ABS_RESERVED_CAP, value);
} }
/* Weight Getter and Setter */
public float getWeight() { public float getWeight() {
return _get(NL, CapacityType.WEIGHT); return _get(NL, CapacityType.WEIGHT);
} }
@ -296,7 +282,6 @@ public class QueueCapacities {
_set(label, CapacityType.WEIGHT, value); _set(label, CapacityType.WEIGHT, value);
} }
/* Weight Getter and Setter */
public float getNormalizedWeight() { public float getNormalizedWeight() {
return _get(NL, CapacityType.NORMALIZED_WEIGHT); return _get(NL, CapacityType.NORMALIZED_WEIGHT);
} }