spark-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vanzin <...@git.apache.org>
Subject [GitHub] spark pull request: [SPARK-5479] [yarn] Handle --py-files correctl...
Date Thu, 04 Jun 2015 22:39:28 GMT
Github user vanzin commented on a diff in the pull request:

    https://github.com/apache/spark/pull/6360#discussion_r31773187
  
    --- Diff: core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala ---
    @@ -315,62 +315,59 @@ object SparkSubmit {
           case _ =>
         }
     
    -    // If we're running a python app, set the main class to our specific python runner
    -    if (args.isPython && deployMode == CLIENT) {
    -      if (args.primaryResource == PYSPARK_SHELL) {
    -        args.mainClass = "org.apache.spark.api.python.PythonGatewayServer"
    -      } else {
    -        // If a python file is provided, add it to the child arguments and list of files
to deploy.
    -        // Usage: PythonAppRunner <main python file> <extra python files>
[app arguments]
    -        args.mainClass = "org.apache.spark.deploy.PythonRunner"
    -        args.childArgs = ArrayBuffer(args.primaryResource, args.pyFiles) ++ args.childArgs
    -        args.files = mergeFileLists(args.files, args.primaryResource)
    -      }
    -      args.files = mergeFileLists(args.files, args.pyFiles)
    -      if (args.pyFiles != null) {
    -        sysProps("spark.submit.pyFiles") = args.pyFiles
    -      }
    -    }
    -
    -    // In yarn mode for a python app, add pyspark archives to files
    -    // that can be distributed with the job
    -    if (args.isPython && clusterManager == YARN) {
    -      var pyArchives: String = null
    -      val pyArchivesEnvOpt = sys.env.get("PYSPARK_ARCHIVES_PATH")
    -      if (pyArchivesEnvOpt.isDefined) {
    -        pyArchives = pyArchivesEnvOpt.get
    -      } else {
    -        if (!sys.env.contains("SPARK_HOME")) {
    -          printErrorAndExit("SPARK_HOME does not exist for python application in yarn
mode.")
    -        }
    -        val pythonPath = new ArrayBuffer[String]
    -        for (sparkHome <- sys.env.get("SPARK_HOME")) {
    -          val pyLibPath = Seq(sparkHome, "python", "lib").mkString(File.separator)
    -          val pyArchivesFile = new File(pyLibPath, "pyspark.zip")
    -          if (!pyArchivesFile.exists()) {
    -            printErrorAndExit("pyspark.zip does not exist for python application in yarn
mode.")
    +    if (args.isPython) {
    --- End diff --
    
    Ok, I'll revert to the old style. I actually would like to move the YARN code to Client.scala
but didn't want to pile that up onto this change.


---
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