aboutsummaryrefslogtreecommitdiff
path: root/launcher/src
diff options
context:
space:
mode:
authorJeff Zhang <zjffdu@apache.org>2016-01-13 23:50:08 -0800
committerReynold Xin <rxin@databricks.com>2016-01-13 23:50:08 -0800
commit8f13cd4cc8dcf638b178774418669a2e247d0652 (patch)
treed51aa99bb49afec8330ccf33f4581531804562bd /launcher/src
parent962e9bcf94da6f5134983f2bf1e56c5cd84f2bf7 (diff)
downloadspark-8f13cd4cc8dcf638b178774418669a2e247d0652.tar.gz
spark-8f13cd4cc8dcf638b178774418669a2e247d0652.tar.bz2
spark-8f13cd4cc8dcf638b178774418669a2e247d0652.zip
[SPARK-12707][SPARK SUBMIT] Remove submit python/R scripts through py…
…spark/sparkR Author: Jeff Zhang <zjffdu@apache.org> Closes #10658 from zjffdu/SPARK-12707.
Diffstat (limited to 'launcher/src')
-rw-r--r--launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
index a95f0f1751..269c89c310 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
@@ -231,11 +231,9 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
// the pyspark command line, then run it using spark-submit.
if (!appArgs.isEmpty() && appArgs.get(0).endsWith(".py")) {
System.err.println(
- "WARNING: Running python applications through 'pyspark' is deprecated as of Spark 1.0.\n" +
+ "Running python applications through 'pyspark' is not supported as of Spark 2.0.\n" +
"Use ./bin/spark-submit <python file>");
- appResource = appArgs.get(0);
- appArgs.remove(0);
- return buildCommand(env);
+ System.exit(-1);
}
checkArgument(appArgs.isEmpty(), "pyspark does not support any application options.");
@@ -258,9 +256,10 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
private List<String> buildSparkRCommand(Map<String, String> env) throws IOException {
if (!appArgs.isEmpty() && appArgs.get(0).endsWith(".R")) {
- appResource = appArgs.get(0);
- appArgs.remove(0);
- return buildCommand(env);
+ System.err.println(
+ "Running R applications through 'sparkR' is not supported as of Spark 2.0.\n" +
+ "Use ./bin/spark-submit <R file>");
+ System.exit(-1);
}
// When launching the SparkR shell, store the spark-submit arguments in the SPARKR_SUBMIT_ARGS
// env variable.