Github user squito commented on a diff in the pull request:

    https://github.com/apache/spark/pull/15237#discussion_r90547665
  
    --- Diff: 
core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala ---
    @@ -102,38 +105,55 @@ private[spark] class FairSchedulableBuilder(val 
rootPool: Pool, conf: SparkConf)
         for (poolNode <- (xml \\ POOLS_PROPERTY)) {
     
           val poolName = (poolNode \ POOL_NAME_PROPERTY).text
    -      var schedulingMode = DEFAULT_SCHEDULING_MODE
    -      var minShare = DEFAULT_MINIMUM_SHARE
    -      var weight = DEFAULT_WEIGHT
     
           val xmlSchedulingMode = (poolNode \ SCHEDULING_MODE_PROPERTY).text
    -      if (xmlSchedulingMode != "") {
    -        try {
    -          schedulingMode = SchedulingMode.withName(xmlSchedulingMode)
    -        } catch {
    -          case e: NoSuchElementException =>
    -            logWarning(s"Unsupported schedulingMode: $xmlSchedulingMode, " 
+
    -              s"using the default schedulingMode: $schedulingMode")
    -        }
    -      }
    +      val schedulingMode = getSchedulingModeValue(xmlSchedulingMode, 
DEFAULT_SCHEDULING_MODE)
     
           val xmlMinShare = (poolNode \ MINIMUM_SHARES_PROPERTY).text
    -      if (xmlMinShare != "") {
    -        minShare = xmlMinShare.toInt
    -      }
    +      val minShare = getIntValue(MINIMUM_SHARES_PROPERTY, xmlMinShare, 
DEFAULT_MINIMUM_SHARE)
     
           val xmlWeight = (poolNode \ WEIGHT_PROPERTY).text
    -      if (xmlWeight != "") {
    -        weight = xmlWeight.toInt
    -      }
    +      val weight = getIntValue(WEIGHT_PROPERTY, xmlWeight, DEFAULT_WEIGHT)
    +
    +      rootPool.addSchedulable(new Pool(poolName, schedulingMode, minShare, 
weight))
     
    -      val pool = new Pool(poolName, schedulingMode, minShare, weight)
    -      rootPool.addSchedulable(pool)
           logInfo("Created pool %s, schedulingMode: %s, minShare: %d, weight: 
%d".format(
             poolName, schedulingMode, minShare, weight))
         }
       }
     
    +  private def getSchedulingModeValue(data: String, defaultValue: 
SchedulingMode): SchedulingMode = {
    +    if (StringUtils.isNotBlank(data)
    +      && checkType(SchedulingMode.withName(data.toUpperCase))
    +      && SchedulingMode.withName(data.toUpperCase) != SchedulingMode.NONE) 
{
    +      SchedulingMode.withName(data.toUpperCase)
    +    } else {
    +      logWarning(s"Unsupported schedulingMode: $data, using the default 
schedulingMode: " +
    +        s"$defaultValue")
    +      defaultValue
    +    }
    +  }
    +
    +  private def getIntValue(propertyName: String, data: String, 
defaultValue: Int): Int = {
    +    if (StringUtils.isNotBlank(data) && checkType(data.toInt)) {
    +      data.toInt
    +    } else {
    +      logWarning(s"$propertyName is blank or invalid: $data, using the 
default $propertyName: " +
    --- End diff --
    
    I think these warning messages need to provide more context -- the person 
who eventually notices these might not be the same as the one who created the 
xml file.    Maybe change to something like:
    
    "Error while loading scheduler allocation file at $path.  $propertyName is 
blank ..."


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org

Reply via email to