You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2016/06/18 05:24:50 UTC
hadoop git commit: YARN-5077. Fix FSLeafQueue#getFairShare() for
queues with zero fairshare. (Yufei Gu via kasha)
Repository: hadoop
Updated Branches:
refs/heads/trunk fbbe0bb62 -> 20f279993
YARN-5077. Fix FSLeafQueue#getFairShare() for queues with zero fairshare. (Yufei Gu via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/20f27999
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/20f27999
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/20f27999
Branch: refs/heads/trunk
Commit: 20f2799938c5cad59f59617cdb0f86e137c3c2c0
Parents: fbbe0bb
Author: Karthik Kambatla <ka...@apache.org>
Authored: Fri Jun 17 22:24:42 2016 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Fri Jun 17 22:24:42 2016 -0700
----------------------------------------------------------------------
.../scheduler/fair/FSLeafQueue.java | 33 ++++-----
.../resourcemanager/scheduler/fair/FSQueue.java | 19 -----
.../scheduler/fair/SchedulingPolicy.java | 11 ---
.../DominantResourceFairnessPolicy.java | 5 --
.../fair/policies/FairSharePolicy.java | 5 --
.../scheduler/fair/policies/FifoPolicy.java | 5 --
.../scheduler/fair/TestFairScheduler.java | 78 ++++++++++++++++++++
7 files changed, 94 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20f27999/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
index d8b51f7..6723fd9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ActiveUsersManager;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerAppUtils;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.DominantResourceFairnessPolicy;
import org.apache.hadoop.yarn.util.resource.Resources;
@Private
@@ -482,8 +481,7 @@ public class FSLeafQueue extends FSQueue {
/**
* Check whether this queue can run this application master under the
- * maxAMShare limit. For FIFO and FAIR policies, check if the VCore usage
- * takes up the entire cluster or maxResources for the queue.
+ * maxAMShare limit.
* @param amResource
* @return true if this queue can run
*/
@@ -493,24 +491,25 @@ public class FSLeafQueue extends FSQueue {
if (Math.abs(maxAMShare - -1.0f) < 0.0001) {
return true;
}
- Resource maxAMResource = Resources.multiply(getFairShare(), maxAMShare);
- Resource ifRunAMResource = Resources.add(amResourceUsage, amResource);
- boolean overMaxAMShareLimit = policy
- .checkIfAMResourceUsageOverLimit(ifRunAMResource, maxAMResource);
+ // If FairShare is zero, use min(maxShare, available resource) to compute
+ // maxAMResource
+ Resource maxResource = Resources.clone(getFairShare());
+ if (maxResource.getMemorySize() == 0) {
+ maxResource.setMemory(
+ Math.min(scheduler.getRootQueueMetrics().getAvailableMB(),
+ getMaxShare().getMemorySize()));
+ }
- // For fair policy and fifo policy which doesn't check VCore usages,
- // additionally check if the AM takes all available VCores or
- // over maxResource to avoid deadlock.
- if (!overMaxAMShareLimit && !policy.equals(
- SchedulingPolicy.getInstance(DominantResourceFairnessPolicy.class))) {
- overMaxAMShareLimit =
- isVCoresOverMaxResource(ifRunAMResource.getVirtualCores()) ||
- ifRunAMResource.getVirtualCores() >=
- scheduler.getRootQueueMetrics().getAvailableVirtualCores();
+ if (maxResource.getVirtualCoresSize() == 0) {
+ maxResource.setVirtualCores(Math.min(
+ scheduler.getRootQueueMetrics().getAvailableVirtualCores(),
+ getMaxShare().getVirtualCoresSize()));
}
- return !overMaxAMShareLimit;
+ Resource maxAMResource = Resources.multiply(maxResource, maxAMShare);
+ Resource ifRunAMResource = Resources.add(amResourceUsage, amResource);
+ return Resources.fitsIn(ifRunAMResource, maxAMResource);
}
public void addAMResourceUsage(Resource amResource) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20f27999/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
index f50c358..25554dd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
@@ -311,25 +311,6 @@ public abstract class FSQueue implements Queue, Schedulable {
}
/**
- * Helper method to check if requested VCores are over maxResource.
- * @param requestedVCores the number of VCores requested
- * @return true if the number of VCores requested is over the maxResource;
- * false otherwise
- */
- protected boolean isVCoresOverMaxResource(int requestedVCores) {
- if (requestedVCores >= scheduler.getAllocationConfiguration().
- getMaxResources(getName()).getVirtualCores()) {
- return true;
- }
-
- if (getParent() == null) {
- return false;
- }
-
- return getParent().isVCoresOverMaxResource(requestedVCores);
- }
-
- /**
* Returns true if queue has at least one app running.
*/
public boolean isActive() {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20f27999/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java
index 160ba4b..9eda46c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/SchedulingPolicy.java
@@ -178,17 +178,6 @@ public abstract class SchedulingPolicy {
Resource usage, Resource fairShare);
/**
- * Check if a leaf queue's AM resource usage over its limit under this policy
- *
- * @param usage {@link Resource} the resource used by application masters
- * @param maxAMResource {@link Resource} the maximum allowed resource for
- * application masters
- * @return true if AM resource usage is over the limit
- */
- public abstract boolean checkIfAMResourceUsageOverLimit(
- Resource usage, Resource maxAMResource);
-
- /**
* Get headroom by calculating the min of <code>clusterAvailable</code> and
* (<code>queueFairShare</code> - <code>queueUsage</code>) resources that are
* applicable to this policy. For eg if only memory then leave other
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20f27999/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java
index 623437a..ad41b11 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.java
@@ -94,11 +94,6 @@ public class DominantResourceFairnessPolicy extends SchedulingPolicy {
}
@Override
- public boolean checkIfAMResourceUsageOverLimit(Resource usage, Resource maxAMResource) {
- return !Resources.fitsIn(usage, maxAMResource);
- }
-
- @Override
public Resource getHeadroom(Resource queueFairShare, Resource queueUsage,
Resource maxAvailable) {
long queueAvailableMemory =
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20f27999/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java
index 42d0420..6aa8405 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java
@@ -151,11 +151,6 @@ public class FairSharePolicy extends SchedulingPolicy {
}
@Override
- public boolean checkIfAMResourceUsageOverLimit(Resource usage, Resource maxAMResource) {
- return usage.getMemorySize() > maxAMResource.getMemorySize();
- }
-
- @Override
public byte getApplicableDepth() {
return SchedulingPolicy.DEPTH_ANY;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20f27999/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java
index c277df1..d3fdcf6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java
@@ -114,11 +114,6 @@ public class FifoPolicy extends SchedulingPolicy {
}
@Override
- public boolean checkIfAMResourceUsageOverLimit(Resource usage, Resource maxAMResource) {
- return usage.getMemorySize() > maxAMResource.getMemorySize();
- }
-
- @Override
public Resource getHeadroom(Resource queueFairShare,
Resource queueUsage, Resource maxAvailable) {
long queueAvailableMemory = Math.max(
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20f27999/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
index 9f22e50..43ebe53 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
@@ -1081,6 +1081,84 @@ public class TestFairScheduler extends FairSchedulerTestBase {
getCurrentReservation().getMemorySize());
}
+ /**
+ * The test verifies that zero-FairShare queues (because of zero/tiny
+ * weight) can get resources for the AM.
+ */
+ @Test
+ public void testRequestAMResourceInZeroFairShareQueue() throws Exception {
+ conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE);
+
+ PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE));
+ out.println("<?xml version=\"1.0\"?>");
+ out.println("<allocations>");
+ out.println("<queue name=\"queue1\">");
+ out.println("<weight>0.0</weight>");
+ out.println("<maxResources>4096mb,10vcores</maxResources>");
+ out.println("<maxAMShare>0.5</maxAMShare>");
+ out.println("</queue>");
+ out.println("<queue name=\"queue2\">");
+ out.println("<weight>2.0</weight>");
+ out.println("</queue>");
+ out.println("<queue name=\"queue3\">");
+ out.println("<weight>0.000001</weight>");
+ out.println("</queue>");
+ out.println("</allocations>");
+ out.close();
+
+ scheduler.init(conf);
+ scheduler.start();
+ scheduler.reinitialize(conf, resourceManager.getRMContext());
+
+ RMNode node =
+ MockNodes.newNodeInfo(1, Resources.createResource(8192, 20),
+ 0, "127.0.0.1");
+ NodeAddedSchedulerEvent nodeEvent = new NodeAddedSchedulerEvent(node);
+ NodeUpdateSchedulerEvent updateEvent = new NodeUpdateSchedulerEvent(node);
+ scheduler.handle(nodeEvent);
+ scheduler.update();
+
+ //create request for non-zero weight queue
+ createSchedulingRequest(1024, "root.queue2", "user2", 1);
+ scheduler.update();
+ scheduler.handle(updateEvent);
+
+ // A managed AM which need 3G memory will not get resource,
+ // since it request more than the maxAMShare (4G * 0.5 = 2G).
+ Resource amResource = Resource.newInstance(1024, 1);
+ int amPriority = RMAppAttemptImpl.AM_CONTAINER_PRIORITY.getPriority();
+ ApplicationAttemptId attId1 = createAppAttemptId(1, 1);
+ createApplicationWithAMResource(attId1, "root.queue1", "user1", amResource);
+ createSchedulingRequestExistingApplication(3 * 1024, 1, amPriority, attId1);
+ FSAppAttempt app1 = scheduler.getSchedulerApp(attId1);
+ scheduler.update();
+ scheduler.handle(updateEvent);
+ assertEquals("Application 1 should not be running",
+ 0, app1.getLiveContainers().size());
+
+ // A managed AM which need 2G memory will get resource,
+ // since it request no more than the maxAMShare (4G * 0.5 = 2G).
+ ApplicationAttemptId attId2 = createAppAttemptId(2, 1);
+ createApplicationWithAMResource(attId2, "root.queue1", "user1", amResource);
+ createSchedulingRequestExistingApplication(2 * 1024, 1, amPriority, attId2);
+ FSAppAttempt app2 = scheduler.getSchedulerApp(attId2);
+ scheduler.update();
+ scheduler.handle(updateEvent);
+ assertEquals("Application 2 should be running",
+ 1, app2.getLiveContainers().size());
+
+ // A managed AM which need 1G memory will get resource, even thought its
+ // fair share is 0 because its weight is tiny(0.000001).
+ ApplicationAttemptId attId3 = createAppAttemptId(3, 1);
+ createApplicationWithAMResource(attId3, "root.queue3", "user1", amResource);
+ createSchedulingRequestExistingApplication(1024, 1, amPriority, attId3);
+ FSAppAttempt app3 = scheduler.getSchedulerApp(attId3);
+ scheduler.update();
+ scheduler.handle(updateEvent);
+ assertEquals("Application 3 should be running",
+ 1, app3.getLiveContainers().size());
+ }
+
@Test (timeout = 500000)
public void testContainerReservationNotExceedingQueueMax() throws Exception {
conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org