big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-6582. FSAppAttempt demand can be updated atomically in updateDemand(). (Karthik Kambatla via Yufei Gu)

Browse Source
This commit is contained in:
Yufei Gu 2017-05-25 14:22:13 -07:00
parent 3fd6a2da4e
commit 87590090c8
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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

@ -1286,24 +1286,21 @@ public void setFairShare(Resource fairShare) {
@Override @Override
public void updateDemand() { public void updateDemand() {
demand = Resources.createResource(0);
// Demand is current consumption plus outstanding requests // Demand is current consumption plus outstanding requests
Resources.addTo(demand, getCurrentConsumption()); Resource tmpDemand = Resources.clone(getCurrentConsumption());
// Add up outstanding resource requests // Add up outstanding resource requests
try {
writeLock.lock();
for (SchedulerRequestKey k : getSchedulerKeys()) { for (SchedulerRequestKey k : getSchedulerKeys()) {
PendingAsk pendingAsk = getPendingAsk(k, ResourceRequest.ANY); PendingAsk pendingAsk = getPendingAsk(k, ResourceRequest.ANY);
if (pendingAsk.getCount() > 0) { if (pendingAsk.getCount() > 0) {
Resources.multiplyAndAddTo(demand, Resources.multiplyAndAddTo(tmpDemand,
pendingAsk.getPerAllocationResource(), pendingAsk.getPerAllocationResource(),
pendingAsk.getCount()); pendingAsk.getCount());
} }
} }
} finally {
writeLock.unlock(); // Update demand
} demand = tmpDemand;
} }
@Override @Override