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 su...@apache.org on 2018/01/23 09:55:53 UTC
[23/50] [abbrv] hadoop git commit: YARN-7755. Clean up deprecation
messages for allocation increments in FS config. Contributed by Wilfred
Spiegelenburg.
YARN-7755. Clean up deprecation messages for allocation increments in FS config. Contributed by Wilfred Spiegelenburg.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22ee6f77
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22ee6f77
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22ee6f77
Branch: refs/heads/YARN-6592
Commit: 22ee6f77e5affbb308287f465ae8d145fc73ff60
Parents: 6e27b20
Author: Yufei Gu <yu...@apache.org>
Authored: Mon Jan 22 10:30:01 2018 -0800
Committer: Yufei Gu <yu...@apache.org>
Committed: Mon Jan 22 10:30:01 2018 -0800
----------------------------------------------------------------------
.../fair/FairSchedulerConfiguration.java | 22 ++++++++++++++------
.../scheduler/fair/TestFairScheduler.java | 4 ++--
2 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/22ee6f77/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 c3351d8..b50e4bb 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
@@ -45,19 +45,29 @@ public class FairSchedulerConfiguration extends Configuration {
public static final Log LOG = LogFactory.getLog(
FairSchedulerConfiguration.class.getName());
- /** Increment request grant-able by the RM scheduler.
- * These properties are looked up in the yarn-site.xml.
- * Kept for backward-compatibility - the new preferred way to configure the
- * increment is the yarn.resource-types.{RESOURCE_NAME}.increment-allocation
- * property, specifically: yarn.resource-types.memory-mb.increment-allocation
- * for memory and yarn.resource-types.vcores.increment-allocation for CPU */
+ /**
+ * Resource Increment request grant-able by the FairScheduler.
+ * This property is looked up in the yarn-site.xml.
+ * @deprecated The preferred way to configure the increment is by using the
+ * yarn.resource-types.{RESOURCE_NAME}.increment-allocation property,
+ * for memory: yarn.resource-types.memory-mb.increment-allocation
+ */
@Deprecated
public static final String RM_SCHEDULER_INCREMENT_ALLOCATION_MB =
YarnConfiguration.YARN_PREFIX + "scheduler.increment-allocation-mb";
+ @Deprecated
public static final int DEFAULT_RM_SCHEDULER_INCREMENT_ALLOCATION_MB = 1024;
+ /**
+ * Resource Increment request grant-able by the FairScheduler.
+ * This property is looked up in the yarn-site.xml.
+ * @deprecated The preferred way to configure the increment is by using the
+ * yarn.resource-types.{RESOURCE_NAME}.increment-allocation property,
+ * for CPU: yarn.resource-types.vcores.increment-allocation
+ */
@Deprecated
public static final String RM_SCHEDULER_INCREMENT_ALLOCATION_VCORES =
YarnConfiguration.YARN_PREFIX + "scheduler.increment-allocation-vcores";
+ @Deprecated
public static final int DEFAULT_RM_SCHEDULER_INCREMENT_ALLOCATION_VCORES = 1;
/** Threshold for container size for making a container reservation as a
http://git-wip-us.apache.org/repos/asf/hadoop/blob/22ee6f77/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 5f21eab..77b6d04 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
@@ -1054,7 +1054,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
// Asked for less than increment allocation.
assertEquals(
- FairSchedulerConfiguration.DEFAULT_RM_SCHEDULER_INCREMENT_ALLOCATION_MB,
+ YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB,
scheduler.getQueueManager().getQueue("queue1").
getResourceUsage().getMemorySize());
@@ -2113,7 +2113,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
scheduler.start();
scheduler.reinitialize(conf, resourceManager.getRMContext());
int minReqSize =
- FairSchedulerConfiguration.DEFAULT_RM_SCHEDULER_INCREMENT_ALLOCATION_MB;
+ YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB;
// First ask, queue1 requests 1 large (minReqSize * 2).
ApplicationAttemptId id11 = createAppAttemptId(1, 1);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org