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 jh...@apache.org on 2019/09/26 00:55:59 UTC

[hadoop] branch branch-2 updated: Addendum to YARN-9730. Support forcing configured partitions to be exclusive based on app node label

This is an automated email from the ASF dual-hosted git repository.

jhung pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new a0e592d  Addendum to YARN-9730. Support forcing configured partitions to be exclusive based on app node label
a0e592d is described below

commit a0e592db5a6d0a10bd71a4100ce715a967585c1b
Author: Jonathan Hung <jh...@linkedin.com>
AuthorDate: Wed Sep 25 17:48:40 2019 -0700

    Addendum to YARN-9730. Support forcing configured partitions to be exclusive based on app node label
    
    (cherry picked from commit d86a1acc866cbda845fb3896dc824baf12217383)
    (cherry picked from commit f4f210d2e57e49999579efb7db039cc623798267)
    (cherry picked from commit 95ec7050b55490454e1de894da572a7e25374907)
---
 .../apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
index ee9aa0d..6717d1b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
@@ -587,9 +587,13 @@ public class RMContextImpl implements RMContext {
   }
 
   public Set<String> getExclusiveEnforcedPartitions() {
-    String[] configuredPartitions = getYarnConfiguration().getStrings(
-        YarnConfiguration.EXCLUSIVE_ENFORCED_PARTITIONS);
     Set<String> exclusiveEnforcedPartitions = new HashSet<>();
+    Configuration conf = getYarnConfiguration();
+    if (conf == null) {
+      return new HashSet<>();
+    }
+    String[] configuredPartitions = conf.getStrings(
+        YarnConfiguration.EXCLUSIVE_ENFORCED_PARTITIONS);
     if (configuredPartitions != null) {
       for (String partition : configuredPartitions) {
         exclusiveEnforcedPartitions.add(partition);


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org