diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacitySchedulerPlanFollower.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacitySchedulerPlanFollower.java index 551f075edb5..2e166890402 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacitySchedulerPlanFollower.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/CapacitySchedulerPlanFollower.java @@ -28,10 +28,10 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Queue; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerDynamicEditException; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.AutoCreatedLeafQueue; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CSQueue; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.PlanQueue; -import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.ReservationQueue; import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.resource.Resources; import org.slf4j.Logger; @@ -92,8 +92,8 @@ protected void addReservationQueue( String planQueueName, Queue queue, String currResId) { PlanQueue planQueue = (PlanQueue)queue; try { - ReservationQueue resQueue = - new ReservationQueue(cs, currResId, planQueue); + AutoCreatedLeafQueue resQueue = + new AutoCreatedLeafQueue(cs, currResId, planQueue); cs.addQueue(resQueue); } catch (SchedulerDynamicEditException e) { LOG.warn( @@ -112,8 +112,8 @@ protected void createDefaultReservationQueue( PlanQueue planQueue = (PlanQueue)queue; if (cs.getQueue(defReservationId) == null) { try { - ReservationQueue defQueue = - new ReservationQueue(cs, defReservationId, planQueue); + AutoCreatedLeafQueue defQueue = + new AutoCreatedLeafQueue(cs, defReservationId, planQueue); cs.addQueue(defQueue); } catch (SchedulerDynamicEditException e) { LOG.warn( 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/capacity/AbstractManagedParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractManagedParentQueue.java new file mode 100644 index 00000000000..888eda9ed56 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractManagedParentQueue.java @@ -0,0 +1,229 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
+
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerDynamicEditException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+/**
+ * A container class for automatically created child leaf queues.
+ * From the user perspective this is equivalent to a LeafQueue,
+ * but functionality wise is a sub-class of ParentQueue
+ */
+public abstract class AbstractManagedParentQueue extends ParentQueue {
+
+ private static final Logger LOG = LoggerFactory.getLogger(
+ AbstractManagedParentQueue.class);
+
+ private int maxAppsForAutoCreatedQueues;
+ private int maxAppsPerUserForAutoCreatedQueues;
+ private int userLimit;
+ private float userLimitFactor;
+
+ public AbstractManagedParentQueue(CapacitySchedulerContext cs,
+ String queueName, CSQueue parent, CSQueue old) throws IOException {
+ super(cs, queueName, parent, old);
+
+ super.setupQueueConfigs(csContext.getClusterResource());
+ initializeLeafQueueConfigs();
+
+ StringBuffer queueInfo = new StringBuffer();
+ queueInfo.append("Created Managed Parent Queue: ").append(queueName)
+ .append("\nof type : [" + getClass())
+ .append("]\nwith capacity: [")
+ .append(super.getCapacity()).append("]\nwith max capacity: [")
+ .append(super.getMaximumCapacity()).append("\nwith max apps: [")
+ .append(getMaxApplicationsForAutoCreatedQueues())
+ .append("]\nwith max apps per user: [")
+ .append(getMaxApplicationsPerUserForAutoCreatedQueues())
+ .append("]\nwith user limit: [").append(getUserLimit())
+ .append("]\nwith user limit factor: [")
+ .append(getUserLimitFactor()).append("].");
+ LOG.info(queueInfo.toString());
+ }
+
+ @Override
+ public void reinitialize(CSQueue newlyParsedQueue, Resource clusterResource)
+ throws IOException {
+ try {
+ writeLock.lock();
+
+ // Set new configs
+ setupQueueConfigs(clusterResource);
+
+ initializeLeafQueueConfigs();
+
+ // run reinitialize on each existing queue, to trigger absolute cap
+ // recomputations
+ for (CSQueue res : this.getChildQueues()) {
+ res.reinitialize(res, clusterResource);
+ }
+ } finally {
+ writeLock.unlock();
+ }
+ }
+
+ /**
+ * Initialize leaf queue configs from template configurations specified on parent queue
+ */
+ protected void initializeLeafQueueConfigs() {
+
+ CapacitySchedulerConfiguration conf = csContext.getConfiguration();
+
+ final String queuePath = super.getQueuePath();
+ int maxApps = conf.getMaximumApplicationsPerQueue(queuePath);
+ if (maxApps < 0) {
+ maxApps = (int) (
+ CapacitySchedulerConfiguration.DEFAULT_MAXIMUM_SYSTEM_APPLICATIIONS
+ * getAbsoluteCapacity());
+ }
+ userLimit = conf.getUserLimit(queuePath);
+ userLimitFactor = conf.getUserLimitFactor(queuePath);
+ maxAppsForAutoCreatedQueues = maxApps;
+ maxAppsPerUserForAutoCreatedQueues =
+ (int) (maxApps * (userLimit / 100.0f) * userLimitFactor);
+
+ }
+
+ /**
+ * Number of maximum applications for each of the auto created leaf queues
+ *
+ * @return maxAppsForAutoCreatedQueues
+ */
+ public int getMaxApplicationsForAutoCreatedQueues() {
+ return maxAppsForAutoCreatedQueues;
+ }
+
+ /**
+ * Number of maximum applications per user for each of the auto created leaf queues
+ *
+ * @return maxAppsPerUserForAutoCreatedQueues
+ */
+ public int getMaxApplicationsPerUserForAutoCreatedQueues() {
+ return maxAppsPerUserForAutoCreatedQueues;
+ }
+
+ /**
+ * User limit value for each of the auto created leaf queues
+ *
+ * @return userLimit
+ */
+ public int getUserLimitForAutoCreatedQueues() {
+ return userLimit;
+ }
+
+ /**
+ * User limit factor value for each of the auto created leaf queues
+ *
+ * @return userLimitFactor
+ */
+ public float getUserLimitFactor() {
+ return userLimitFactor;
+ }
+
+ public int getMaxAppsForAutoCreatedQueues() {
+ return maxAppsForAutoCreatedQueues;
+ }
+
+ public int getMaxAppsPerUserForAutoCreatedQueues() {
+ return maxAppsPerUserForAutoCreatedQueues;
+ }
+
+ public int getUserLimit() {
+ return userLimit;
+ }
+
+ /**
+ * Add the specified child queue
+ * @param childQueue reference to the child queue to be added
+ * @throws SchedulerDynamicEditException
+ */
+ public void addChildQueue(CSQueue childQueue)
+ throws SchedulerDynamicEditException {
+ try {
+ writeLock.lock();
+ if (childQueue.getCapacity() > 0) {
+ throw new SchedulerDynamicEditException(
+ "Queue " + childQueue + " being added has non zero capacity.");
+ }
+ boolean added = this.childQueues.add(childQueue);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("updateChildQueues (action: add queue): " + added + " "
+ + getChildQueuesToPrint());
+ }
+ } finally {
+ writeLock.unlock();
+ }
+ }
+
+ /**
+ * Remove the specified child queue
+ * @param childQueue reference to the child queue to be removed
+ * @throws SchedulerDynamicEditException
+ */
+ public void removeChildQueue(CSQueue childQueue)
+ throws SchedulerDynamicEditException {
+ try {
+ writeLock.lock();
+ if (childQueue.getCapacity() > 0) {
+ throw new SchedulerDynamicEditException(
+ "Queue " + childQueue + " being removed has non zero capacity.");
+ }
+ Iterator
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
-import java.io.IOException;
-
import org.apache.hadoop.yarn.api.records.Resource;
-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerDynamicEditException;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.QueueEntitlement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * This represents a dynamic {@link LeafQueue} managed by the
- * {@link ReservationSystem}
- *
- */
-public class ReservationQueue extends LeafQueue {
+import java.io.IOException;
+
+public class AutoCreatedLeafQueue extends LeafQueue {
private static final Logger LOG = LoggerFactory
- .getLogger(ReservationQueue.class);
+ .getLogger(AutoCreatedLeafQueue.class);
- private PlanQueue parent;
+ private AbstractManagedParentQueue parent;
- public ReservationQueue(CapacitySchedulerContext cs, String queueName,
- PlanQueue parent) throws IOException {
+ public AutoCreatedLeafQueue(CapacitySchedulerContext cs, String queueName,
+ AbstractManagedParentQueue parent) throws IOException {
super(cs, queueName, parent, null);
- // the following parameters are common to all reservation in the plan
- updateQuotas(parent.getUserLimitForReservation(),
+
+ updateApplicationAndUserLimits(parent.getUserLimitForAutoCreatedQueues(),
parent.getUserLimitFactor(),
- parent.getMaxApplicationsForReservations(),
- parent.getMaxApplicationsPerUserForReservation());
+ parent.getMaxApplicationsForAutoCreatedQueues(),
+ parent.getMaxApplicationsPerUserForAutoCreatedQueues());
+
this.parent = parent;
}
@@ -55,21 +49,18 @@ public void reinitialize(CSQueue newlyParsedQueue,
Resource clusterResource) throws IOException {
try {
writeLock.lock();
- // Sanity check
- if (!(newlyParsedQueue instanceof ReservationQueue) || !newlyParsedQueue
- .getQueuePath().equals(getQueuePath())) {
- throw new IOException(
- "Trying to reinitialize " + getQueuePath() + " from "
- + newlyParsedQueue.getQueuePath());
- }
+
+ validate(newlyParsedQueue);
+
super.reinitialize(newlyParsedQueue, clusterResource);
CSQueueUtils.updateQueueStatistics(resourceCalculator, clusterResource,
this, labelManager, null);
- updateQuotas(parent.getUserLimitForReservation(),
+ updateApplicationAndUserLimits(parent.getUserLimitForAutoCreatedQueues(),
parent.getUserLimitFactor(),
- parent.getMaxApplicationsForReservations(),
- parent.getMaxApplicationsPerUserForReservation());
+ parent.getMaxApplicationsForAutoCreatedQueues(),
+ parent.getMaxApplicationsPerUserForAutoCreatedQueues());
+
} finally {
writeLock.unlock();
}
@@ -78,9 +69,9 @@ public void reinitialize(CSQueue newlyParsedQueue,
/**
* This methods to change capacity for a queue and adjusts its
* absoluteCapacity
- *
+ *
* @param entitlement the new entitlement for the queue (capacity,
- * maxCapacity, etc..)
+ * maxCapacity)
* @throws SchedulerDynamicEditException
*/
public void setEntitlement(QueueEntitlement entitlement)
@@ -94,8 +85,6 @@ public void setEntitlement(QueueEntitlement entitlement)
}
setCapacity(capacity);
setAbsoluteCapacity(getParent().getAbsoluteCapacity() * getCapacity());
- // note: we currently set maxCapacity to capacity
- // this might be revised later
setMaxCapacity(entitlement.getMaxCapacity());
if (LOG.isDebugEnabled()) {
LOG.debug("successfully changed to " + capacity + " for queue " + this
@@ -106,12 +95,14 @@ public void setEntitlement(QueueEntitlement entitlement)
}
}
- private void updateQuotas(int userLimit, float userLimitFactor,
- int maxAppsForReservation, int maxAppsPerUserForReservation) {
- setUserLimit(userLimit);
- setUserLimitFactor(userLimitFactor);
- setMaxApplications(maxAppsForReservation);
- maxApplicationsPerUser = maxAppsPerUserForReservation;
+ private void validate(final CSQueue newlyParsedQueue) throws IOException {
+ if (!(newlyParsedQueue instanceof AutoCreatedLeafQueue) || !newlyParsedQueue
+ .getQueuePath().equals(getQueuePath())) {
+ throw new IOException(
+ "Error trying to reinitialize " + getQueuePath() + " from "
+ + newlyParsedQueue.getQueuePath());
+ }
+
}
@Override
@@ -119,4 +110,12 @@ protected void setupConfigurableCapacities() {
CSQueueUtils.updateAndCheckCapacitiesByLabel(getQueuePath(),
queueCapacities, parent == null ? null : parent.getQueueCapacities());
}
+
+ private void updateApplicationAndUserLimits(int userLimit, float userLimitFactor,
+ int maxAppsForAutoCreatedQueues, int maxAppsPerUserForAutoCreatedQueues) {
+ setUserLimit(userLimit);
+ setUserLimitFactor(userLimitFactor);
+ setMaxApplications(maxAppsForAutoCreatedQueues);
+ setMaxApplicationsPerUser(maxAppsPerUserForAutoCreatedQueues);
+ }
}
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/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index d91aa55a487..ca4f73275d7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -1921,12 +1921,12 @@ public void removeQueue(String queueName)
writeLock.lock();
LOG.info("Removing queue: " + queueName);
CSQueue q = this.getQueue(queueName);
- if (!(q instanceof ReservationQueue)) {
+ if (!(q instanceof AutoCreatedLeafQueue)) {
throw new SchedulerDynamicEditException(
"The queue that we are asked " + "to remove (" + queueName
- + ") is not a ReservationQueue");
+ + ") is not a AutoCreatedLeafQueue");
}
- ReservationQueue disposableLeafQueue = (ReservationQueue) q;
+ AutoCreatedLeafQueue disposableLeafQueue = (AutoCreatedLeafQueue) q;
// at this point we should have no more apps
if (disposableLeafQueue.getNumApplications() > 0) {
throw new SchedulerDynamicEditException(
@@ -1936,9 +1936,9 @@ public void removeQueue(String queueName)
+ " pending apps");
}
- ((PlanQueue) disposableLeafQueue.getParent()).removeChildQueue(q);
+ ((AbstractManagedParentQueue) disposableLeafQueue.getParent()).removeChildQueue(q);
this.queueManager.removeQueue(queueName);
- LOG.info("Removal of ReservationQueue " + queueName + " has succeeded");
+ LOG.info("Removal of AutoCreatedLeafQueue " + queueName + " has succeeded");
} finally {
writeLock.unlock();
}
@@ -1949,25 +1949,25 @@ public void addQueue(Queue queue)
throws SchedulerDynamicEditException {
try {
writeLock.lock();
- if (!(queue instanceof ReservationQueue)) {
+ if (!(queue instanceof AutoCreatedLeafQueue)) {
throw new SchedulerDynamicEditException(
- "Queue " + queue.getQueueName() + " is not a ReservationQueue");
+ "Queue " + queue.getQueueName() + " is not a AutoCreatedLeafQueue");
}
- ReservationQueue newQueue = (ReservationQueue) queue;
+ AutoCreatedLeafQueue newQueue = (AutoCreatedLeafQueue) queue;
- if (newQueue.getParent() == null || !(newQueue
- .getParent() instanceof PlanQueue)) {
+ if (newQueue.getParent() == null || !(AbstractManagedParentQueue.class.isAssignableFrom(newQueue
+ .getParent().getClass()))) {
throw new SchedulerDynamicEditException(
"ParentQueue for " + newQueue.getQueueName()
- + " is not properly set (should be set and be a PlanQueue)");
+ + " is not properly set (should be set and be a PlanQueue or AutoCreateEnableParentQueue)");
}
- PlanQueue parentPlan = (PlanQueue) newQueue.getParent();
+ AbstractManagedParentQueue parentPlan = (AbstractManagedParentQueue) newQueue.getParent();
String queuename = newQueue.getQueueName();
parentPlan.addChildQueue(newQueue);
this.queueManager.addQueue(queuename, newQueue);
- LOG.info("Creation of ReservationQueue " + newQueue + " succeeded");
+ LOG.info("Creation of AutoCreatedLeafQueue " + newQueue + " succeeded");
} finally {
writeLock.unlock();
}
@@ -1981,21 +1981,21 @@ public void setEntitlement(String inQueue, QueueEntitlement entitlement)
LeafQueue queue = this.queueManager.getAndCheckLeafQueue(inQueue);
ParentQueue parent = (ParentQueue) queue.getParent();
- if (!(queue instanceof ReservationQueue)) {
+ if (!(queue instanceof AutoCreatedLeafQueue)) {
throw new SchedulerDynamicEditException(
"Entitlement can not be" + " modified dynamically since queue "
- + inQueue + " is not a ReservationQueue");
+ + inQueue + " is not a AutoCreatedLeafQueue");
}
- if (!(parent instanceof PlanQueue)) {
+ if (parent == null || !(AbstractManagedParentQueue.class.isAssignableFrom(parent.getClass()))) {
throw new SchedulerDynamicEditException(
- "The parent of ReservationQueue " + inQueue
- + " must be an PlanQueue");
+ "The parent of AutoCreatedLeafQueue " + inQueue
+ + " must be a PlanQueue/AutoCreateEnabledParentQueue");
}
- ReservationQueue newQueue = (ReservationQueue) queue;
+ AutoCreatedLeafQueue newQueue = (AutoCreatedLeafQueue) queue;
- float sumChilds = ((PlanQueue) parent).sumOfChildCapacities();
+ float sumChilds = parent.sumOfChildCapacities();
float newChildCap =
sumChilds - queue.getCapacity() + entitlement.getCapacity();
@@ -2010,11 +2010,11 @@ public void setEntitlement(String inQueue, QueueEntitlement entitlement)
newQueue.setEntitlement(entitlement);
} else{
throw new SchedulerDynamicEditException(
- "Sum of child queues would exceed 100% for PlanQueue: " + parent
+ "Sum of child queues would exceed 100% for auto creating parent queue : " + parent
.getQueueName());
}
LOG.info(
- "Set entitlement for ReservationQueue " + inQueue + " to " + queue
+ "Set entitlement for AutoCreatedLeafQueue " + inQueue + " to " + queue
.getCapacity() + " request was (" + entitlement.getCapacity()
+ ")");
} finally {
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/capacity/CapacitySchedulerQueueManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java
index 48c289f0cde..7be2529a437 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java
@@ -238,7 +238,7 @@ static CSQueue parseQueue(
queueName + ReservationConstants.DEFAULT_QUEUE_SUFFIX;
List