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

YARN-7049. FSAppAttempt preemption related fields have confusing names. (Contributed by Karthik Kambatla via Yufei Gu)

Browse Source 
(cherry picked from commit 9e2699ac2c99d8df85191dd7fbf9468b00f5b5aa)
This commit is contained in:
Yufei Gu 2017-08-24 17:52:41 -07:00
parent e12358c5ce
commit 389b659c94
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java
View File

@ -82,8 +82,9 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
// Preemption related variables // Preemption related variables
private final Object preemptionVariablesLock = new Object(); private final Object preemptionVariablesLock = new Object();
private final Resource preemptedResources = Resources.clone(Resources.none()); private final Set<RMContainer> containersToBePreempted = new HashSet<>();
private final Set<RMContainer> containersToPreempt = new HashSet<>(); private final Resource resourcesToBePreempted =
Resources.clone(Resources.none());
private Resource fairshareStarvation = Resources.none(); private Resource fairshareStarvation = Resources.none();
private long lastTimeAtFairShare; private long lastTimeAtFairShare;
@ -565,16 +566,17 @@ Resource getMinshareStarvation() {
void trackContainerForPreemption(RMContainer container) { void trackContainerForPreemption(RMContainer container) {
synchronized (preemptionVariablesLock) { synchronized (preemptionVariablesLock) {
if (containersToPreempt.add(container)) { if (containersToBePreempted.add(container)) {
Resources.addTo(preemptedResources, container.getAllocatedResource()); Resources.addTo(resourcesToBePreempted,
container.getAllocatedResource());
} }
} }
} }
private void untrackContainerForPreemption(RMContainer container) { private void untrackContainerForPreemption(RMContainer container) {
synchronized (preemptionVariablesLock) { synchronized (preemptionVariablesLock) {
if (containersToPreempt.remove(container)) { if (containersToBePreempted.remove(container)) {
Resources.subtractFrom(preemptedResources, Resources.subtractFrom(resourcesToBePreempted,
container.getAllocatedResource()); container.getAllocatedResource());
} }
} }
@ -583,7 +585,7 @@ private void untrackContainerForPreemption(RMContainer container) {
Set<ContainerId> getPreemptionContainerIds() { Set<ContainerId> getPreemptionContainerIds() {
synchronized (preemptionVariablesLock) { synchronized (preemptionVariablesLock) {
Set<ContainerId> preemptionContainerIds = new HashSet<>(); Set<ContainerId> preemptionContainerIds = new HashSet<>();
for (RMContainer container : containersToPreempt) { for (RMContainer container : containersToBePreempted) {
preemptionContainerIds.add(container.getContainerId()); preemptionContainerIds.add(container.getContainerId());
} }
return preemptionContainerIds; return preemptionContainerIds;
@ -604,7 +606,7 @@ boolean canContainerBePreempted(RMContainer container) {
} }
synchronized (preemptionVariablesLock) { synchronized (preemptionVariablesLock) {
if (containersToPreempt.contains(container)) { if (containersToBePreempted.contains(container)) {
// The container is already under consideration for preemption // The container is already under consideration for preemption
return false; return false;
} }
@ -1269,9 +1271,9 @@ public Resource getResourceUsage() {
// Subtract copies the object, so that we have a snapshot, // Subtract copies the object, so that we have a snapshot,
// in case usage changes, while the caller is using the value // in case usage changes, while the caller is using the value
synchronized (preemptionVariablesLock) { synchronized (preemptionVariablesLock) {
return containersToPreempt.isEmpty() return containersToBePreempted.isEmpty()
? getCurrentConsumption() ? getCurrentConsumption()
: Resources.subtract(getCurrentConsumption(), preemptedResources); : Resources.subtract(getCurrentConsumption(), resourcesToBePreempted);
} }
} }