YARN-5564. Fix typo in RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE. Contributed by Ray Chiang
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/27c3b862 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/27c3b862 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/27c3b862 Branch: refs/heads/HDFS-7240 Commit: 27c3b86252386c9c064a6420b3c650644cbb9ef3 Parents: f4a21d3 Author: Naganarasimha <[email protected]> Authored: Fri Aug 26 08:47:21 2016 +0530 Committer: Naganarasimha <[email protected]> Committed: Fri Aug 26 08:47:21 2016 +0530 ---------------------------------------------------------------------- .../scheduler/fair/FairSchedulerConfiguration.java | 4 ++-- .../resourcemanager/scheduler/fair/FairSchedulerTestBase.java | 4 ++-- .../server/resourcemanager/scheduler/fair/TestFairScheduler.java | 2 +- .../scheduler/fair/TestFairSchedulerPreemption.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/27c3b862/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.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/FairSchedulerConfiguration.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/FairSchedulerConfiguration.java index 22cb10c..b18dd7d 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/FairSchedulerConfiguration.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/FairSchedulerConfiguration.java @@ -52,7 +52,7 @@ public class FairSchedulerConfiguration extends Configuration { * multiple of increment allocation. Only container sizes above this are * allowed to reserve a node */ public static final String - RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE = + RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE = YarnConfiguration.YARN_PREFIX + "scheduler.reservation-threshold.increment-multiple"; public static final float @@ -190,7 +190,7 @@ public class FairSchedulerConfiguration extends Configuration { public float getReservationThresholdIncrementMultiple() { return getFloat( - RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE, + RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE, DEFAULT_RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/27c3b862/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerTestBase.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/FairSchedulerTestBase.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/FairSchedulerTestBase.java index ec0e6aa..8e6272a 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/FairSchedulerTestBase.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/FairSchedulerTestBase.java @@ -84,7 +84,7 @@ public class FairSchedulerTestBase { conf.setFloat( FairSchedulerConfiguration - .RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE, + .RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE, TEST_RESERVATION_THRESHOLD); return conf; } @@ -280,4 +280,4 @@ public class FairSchedulerTestBase { Assert.assertEquals(resource.getVirtualCores(), app.getCurrentConsumption().getVirtualCores()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/27c3b862/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 da9d667..c348572 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 @@ -1455,7 +1455,7 @@ public class TestFairScheduler extends FairSchedulerTestBase { // Set threshold to 2 * 1024 ==> 2048 MB & 2 * 1 ==> 2 vcores (test will // use vcores) conf.setFloat(FairSchedulerConfiguration. - RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE, + RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE, 2f); scheduler.init(conf); scheduler.start(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/27c3b862/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.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/TestFairSchedulerPreemption.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/TestFairSchedulerPreemption.java index 79f4601..2cbe507 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/TestFairSchedulerPreemption.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/TestFairSchedulerPreemption.java @@ -135,7 +135,7 @@ public class TestFairSchedulerPreemption extends FairSchedulerTestBase { conf.setFloat(FairSchedulerConfiguration.PREEMPTION_THRESHOLD, 0f); conf.setFloat( FairSchedulerConfiguration - .RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE, + .RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE, TEST_RESERVATION_THRESHOLD); resourceManager = new MockRM(conf); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
