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 22cb10c92a..b18dd7dee4 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 Resource getIncrementAllocation() { public float getReservationThresholdIncrementMultiple() { return getFloat( - RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE, + RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE, DEFAULT_RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE); } 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 ec0e6aa875..8e6272a6df 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 Configuration createConfiguration() { conf.setFloat( FairSchedulerConfiguration - .RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE, + .RM_SCHEDULER_RESERVATION_THRESHOLD_INCREMENT_MULTIPLE, TEST_RESERVATION_THRESHOLD); return conf; } @@ -280,4 +280,4 @@ protected void checkAppConsumption(FSAppAttempt app, Resource resource) Assert.assertEquals(resource.getVirtualCores(), app.getCurrentConsumption().getVirtualCores()); } -} \ No newline at end of file +} 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 da9d667439..c348572ff2 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 void testReservationThresholdGatesReservations() throws Exception { // 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(); 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 79f4601e21..2cbe507ee3 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 @@ private void startResourceManagerWithRealFairScheduler() { 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);