Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
YARN-3635. Refactored current queue mapping implementation in Capacit…
…yScheduler to use a generic PlacementManager framework. Contributed by Wangda Tan
- Loading branch information
Showing
13 changed files
with
584 additions
and
279 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
...c/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,95 @@ | |||
| /** | |||
| * 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.placement; | |||
|
|
|||
| import java.util.List; | |||
| import java.util.concurrent.locks.ReentrantReadWriteLock; | |||
| import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; | |||
| import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; | |||
|
|
|||
| import org.apache.commons.lang.StringUtils; | |||
| import org.apache.commons.logging.Log; | |||
| import org.apache.commons.logging.LogFactory; | |||
| import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; | |||
| import org.apache.hadoop.yarn.exceptions.YarnException; | |||
|
|
|||
| import com.google.common.annotations.VisibleForTesting; | |||
|
|
|||
| public class PlacementManager { | |||
| private static final Log LOG = LogFactory.getLog(PlacementManager.class); | |||
|
|
|||
| List<PlacementRule> rules; | |||
| ReadLock readLock; | |||
| WriteLock writeLock; | |||
|
|
|||
| public PlacementManager() { | |||
| ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); | |||
| readLock = lock.readLock(); | |||
| writeLock = lock.writeLock(); | |||
| } | |||
|
|
|||
| public void updateRules(List<PlacementRule> rules) { | |||
| try { | |||
| writeLock.lock(); | |||
| this.rules = rules; | |||
| } finally { | |||
| writeLock.unlock(); | |||
| } | |||
| } | |||
|
|
|||
| public void placeApplication(ApplicationSubmissionContext asc, String user) | |||
| throws YarnException { | |||
| try { | |||
| readLock.lock(); | |||
| if (null == rules || rules.isEmpty()) { | |||
| return; | |||
| } | |||
|
|
|||
| String newQueueName = null; | |||
| for (PlacementRule rule : rules) { | |||
| newQueueName = rule.getQueueForApp(asc, user); | |||
| if (newQueueName != null) { | |||
| break; | |||
| } | |||
| } | |||
|
|
|||
| // Failed to get where to place application | |||
| if (null == newQueueName && null == asc.getQueue()) { | |||
| String msg = "Failed to get where to place application=" | |||
| + asc.getApplicationId(); | |||
| LOG.error(msg); | |||
| throw new YarnException(msg); | |||
| } | |||
|
|
|||
| // Set it to ApplicationSubmissionContext | |||
| if (!StringUtils.equals(asc.getQueue(), newQueueName)) { | |||
| LOG.info("Placed application=" + asc.getApplicationId() + " to queue=" | |||
| + newQueueName + ", original queue=" + asc.getQueue()); | |||
| asc.setQueue(newQueueName); | |||
| } | |||
| } finally { | |||
| readLock.unlock(); | |||
| } | |||
| } | |||
|
|
|||
| @VisibleForTesting | |||
| public List<PlacementRule> getPlacementRules() { | |||
| return rules; | |||
| } | |||
| } | |||
55 changes: 55 additions & 0 deletions
55
.../src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,55 @@ | |||
| /** | |||
| * 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.placement; | |||
|
|
|||
| import java.util.Map; | |||
|
|
|||
| import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; | |||
| import org.apache.hadoop.yarn.exceptions.YarnException; | |||
| import org.apache.hadoop.yarn.server.resourcemanager.RMContext; | |||
|
|
|||
| public abstract class PlacementRule { | |||
| public String getName() { | |||
| return this.getClass().getName(); | |||
| } | |||
|
|
|||
| public void initialize(Map<String, String> parameters, RMContext rmContext) | |||
| throws YarnException { | |||
| } | |||
|
|
|||
| /** | |||
| * Get queue for a given application | |||
| * | |||
| * @param asc application submission context | |||
| * @param user userName | |||
| * | |||
| * @throws YarnException | |||
| * if any error happens | |||
| * | |||
| * @return <p> | |||
| * non-null value means it is determined | |||
| * </p> | |||
| * <p> | |||
| * null value means it is undetermined, so next {@link PlacementRule} | |||
| * in the {@link PlacementManager} will take care | |||
| * </p> | |||
| */ | |||
| public abstract String getQueueForApp(ApplicationSubmissionContext asc, | |||
| String user) throws YarnException; | |||
| } | |||
Oops, something went wrong.