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 ae...@apache.org on 2016/03/18 19:25:24 UTC
[24/46] hadoop git commit: YARN-4560. Make scheduler error checking
message more user friendly. (Ray Chiang via kasha)
YARN-4560. Make scheduler error checking message more user friendly. (Ray Chiang via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3ef55007
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3ef55007
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3ef55007
Branch: refs/heads/HDFS-7240
Commit: 3ef5500783f043ff206458d8c10ed3d5405a8b0c
Parents: a888b5b
Author: Karthik Kambatla <ka...@apache.org>
Authored: Tue Mar 15 23:45:01 2016 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Tue Mar 15 23:45:01 2016 -0700
----------------------------------------------------------------------
.../scheduler/fair/FairScheduler.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ef55007/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.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/FairScheduler.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/FairScheduler.java
index ba90e21..3df0600 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/FairScheduler.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/FairScheduler.java
@@ -235,12 +235,13 @@ public class FairScheduler extends
if (minMem < 0 || minMem > maxMem) {
throw new YarnRuntimeException("Invalid resource scheduler memory"
- + " allocation configuration"
- + ", " + YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB
+ + " allocation configuration: "
+ + YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB
+ "=" + minMem
+ ", " + YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB
- + "=" + maxMem + ", min should equal greater than 0"
- + ", max should be no smaller than min.");
+ + "=" + maxMem + ". Both values must be greater than or equal to 0"
+ + "and the maximum allocation value must be greater than or equal to"
+ + "the minimum allocation value.");
}
// validate scheduler vcores allocation setting
@@ -253,12 +254,13 @@ public class FairScheduler extends
if (minVcores < 0 || minVcores > maxVcores) {
throw new YarnRuntimeException("Invalid resource scheduler vcores"
- + " allocation configuration"
- + ", " + YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES
+ + " allocation configuration: "
+ + YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES
+ "=" + minVcores
+ ", " + YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES
- + "=" + maxVcores + ", min should equal greater than 0"
- + ", max should be no smaller than min.");
+ + "=" + maxVcores + ". Both values must be greater than or equal to 0"
+ + "and the maximum allocation value must be greater than or equal to"
+ + "the minimum allocation value.");
}
}