Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-4623]Add the some error infomation if using spark-sql in yarn-cluster mode #3479

Closed
wants to merge 7 commits into from
Closed

[SPARK-4623]Add the some error infomation if using spark-sql in yarn-cluster mode #3479

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fad75a
Add the Error infomation using spark-sql in yarn-cluster mode
SaintBacchus Nov 26, 2014
7bcecc2
Merge branch 'master' of https://github.com/apache/spark into codereview
SaintBacchus Nov 26, 2014
ec957bc
Add the some error infomation if using spark-sql in yarn-cluster mode
SaintBacchus Nov 26, 2014
8e112c5
singular form
SaintBacchus Nov 27, 2014
f1c5c8d
Merge branch 'master' into sparkSqlShell
SaintBacchus Nov 30, 2014
e6c1eb7
add a comment in bin/spark-sql to remind user who wants to change the…
SaintBacchus Nov 30, 2014
35829a9
improve the description of comment
SaintBacchus Nov 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ object SparkSubmit {
printErrorAndExit("Cluster deploy mode is currently not supported for python applications.")
case (_, CLUSTER) if isShell(args.primaryResource) =>
printErrorAndExit("Cluster deploy mode is not applicable to Spark shells.")
case (_, CLUSTER) if isSqlShell(args.mainClass) =>
printErrorAndExit("Cluster deploy mode is not applicable to Spark Sql shells.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

“shells" should be in singular form.

case _ =>
}

Expand Down Expand Up @@ -388,6 +390,13 @@ object SparkSubmit {
primaryResource == SPARK_SHELL || primaryResource == PYSPARK_SHELL
}

/**
* Return whether the given main class represents a sql shell.
*/
private[spark] def isSqlShell(mainClass: String): Boolean = {
mainClass == "org.apache.spark.sql.hive.thriftserver.SparkSQLCLIDriver"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add comment int he SparkSQLCLIDriver class that explains there is a dependency here on the exact name? Otherwise that class could be renamed and this would break inadvertently.

}

/**
* Return whether the given primary resource requires running python.
*/
Expand Down