From ab03266831cb52588551da8608eff10a5b951f92 Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Tue, 15 Mar 2016 23:45:01 -0700 Subject: [PATCH] YARN-4560. Make scheduler error checking message more user friendly. (Ray Chiang via kasha) (cherry picked from commit 3ef5500783f043ff206458d8c10ed3d5405a8b0c) --- .../scheduler/fair/FairScheduler.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 ba90e2132dc..3df060026db 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."); } }