spark-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tigerquoll <...@git.apache.org>
Subject [GitHub] spark pull request: Spark Core - [SPARK-3620] - Refactor of SparkS...
Date Mon, 29 Sep 2014 11:46:33 GMT
Github user tigerquoll commented on a diff in the pull request:

    https://github.com/apache/spark/pull/2516#discussion_r18148846
  
    --- Diff: core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala ---
    @@ -406,22 +412,173 @@ private[spark] class SparkSubmitArguments(args: Seq[String]) {
       }
     }
     
    -object SparkSubmitArguments {
    -  /** Load properties present in the given file. */
    -  def getPropertiesFromFile(file: File): Seq[(String, String)] = {
    -    require(file.exists(), s"Properties file $file does not exist")
    -    require(file.isFile(), s"Properties file $file is not a normal file")
    -    val inputStream = new FileInputStream(file)
    +private[spark] object SparkSubmitArguments {
    +  /**
    +   * Resolves Configuration sources in order of highest to lowest
    +   * 1. Each map passed in as additionalConfig from first to last
    +   * 2. Environment variables (including legacy variable mappings)
    +   * 3. System config variables (eg by using -Dspark.var.name)
    +   * 4  SPARK_DEFAULT_CONF/spark-defaults.conf or SPARK_HOME/conf/spark-defaults.conf
    +   * 5. hard coded defaults in class path at spark-submit-defaults.prop
    +   *
    +   * A property file specified by one of the means listed above gets read in and the
properties are
    +   * considered to be at the priority of the method that specified the files.
    +   * A property specified in a property file will not override an existing
    +   * config value at that same level
    +   *
    +   * @param additionalConfigs Seq of additional Map[ConfigName->ConfigValue] in order
of highest
    +   *                          priority to lowest this will have priority over internal
sources
    +   * @return Map[propName->propFile] containing values merged from all sources in
order of priority
    +   */
    +  def mergeSparkProperties(additionalConfigs: Seq [Map[String,String]]) = {
    +    // Configuration read in from spark-submit-defaults.prop file found on the classpath
    +    var hardCodedDefaultConfig: Option[Map[String,String]] = None
    --- End diff --
    
    Ok, nuked the property file read in from the classpath and now using a default value map


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

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


Mime
View raw message