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 890334f17b..6f49b8594f 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 @@ -391,7 +391,10 @@ void initScheduler(Configuration configuration) throws + getMaximumResourceCapability() + ">, " + "asynchronousScheduling=" + scheduleAsynchronously + ", " + "asyncScheduleInterval=" + asyncScheduleInterval + "ms" + ",multiNodePlacementEnabled=" - + multiNodePlacementEnabled); + + multiNodePlacementEnabled + ", " + "assignMultipleEnabled=" + + assignMultipleEnabled + ", " + "maxAssignPerHeartbeat=" + + maxAssignPerHeartbeat + ", " + "offswitchPerHeartbeatLimit=" + + offswitchPerHeartbeatLimit); } finally { writeLock.unlock(); } @@ -483,8 +486,14 @@ public void reinitialize(Configuration newConf, RMContext rmContext, this.isLazyPreemptionEnabled = this.conf.getLazyPreemptionEnabled(); // Setup how many containers we can allocate for each round + assignMultipleEnabled = this.conf.getAssignMultipleEnabled(); + maxAssignPerHeartbeat = this.conf.getMaxAssignPerHeartbeat(); offswitchPerHeartbeatLimit = this.conf.getOffSwitchPerHeartbeatLimit(); + LOG.info("assignMultipleEnabled = " + assignMultipleEnabled + "\n" + + "maxAssignPerHeartbeat = " + maxAssignPerHeartbeat + "\n" + + "offswitchPerHeartbeatLimit = " + offswitchPerHeartbeatLimit); + super.reinitialize(newConf, rmContext); } maxRunningEnforcer.updateRunnabilityOnReload(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md index 71fe287ba6..169ee3bcb8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md @@ -468,7 +468,7 @@ Note, this feature should be disabled if YARN is deployed separately with the fi * Container Allocation per NodeManager Heartbeat - The `CapacityScheduler` supports the following parameters to control how many containers can be allocated in each NodeManager heartbeat. + The `CapacityScheduler` supports the following parameters to control how many containers can be allocated in each NodeManager heartbeat. These parameters are refreshable via *yarn rmadmin -refreshQueues*. | Property | Description | |:---- |:---- |