aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorPatrick Wendell <patrick@databricks.com>2015-04-30 14:59:20 -0700
committerPatrick Wendell <patrick@databricks.com>2015-04-30 14:59:20 -0700
commite0628f2fae7f99d096f9dd625876a60d11020d9b (patch)
tree33739db91af80b01dddf1935f24a73a6267a1a43 /launcher
parentadbdb19a7d2cc939795f0cecbdc07c605dc946c1 (diff)
downloadspark-e0628f2fae7f99d096f9dd625876a60d11020d9b.tar.gz
spark-e0628f2fae7f99d096f9dd625876a60d11020d9b.tar.bz2
spark-e0628f2fae7f99d096f9dd625876a60d11020d9b.zip
Revert "[SPARK-5342] [YARN] Allow long running Spark apps to run on secure YARN/HDFS"
This reverts commit 6c65da6bb7d1213e6a4a9f7fd1597d029d87d07c.
Diffstat (limited to 'launcher')
-rw-r--r--launcher/src/main/java/org/apache/spark/launcher/SparkSubmitOptionParser.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitOptionParser.java b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitOptionParser.java
index 2290000876..8526d2e7cf 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitOptionParser.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitOptionParser.java
@@ -69,10 +69,8 @@ class SparkSubmitOptionParser {
// YARN-only options.
protected final String ARCHIVES = "--archives";
protected final String EXECUTOR_CORES = "--executor-cores";
- protected final String KEYTAB = "--keytab";
- protected final String NUM_EXECUTORS = "--num-executors";
- protected final String PRINCIPAL = "--principal";
protected final String QUEUE = "--queue";
+ protected final String NUM_EXECUTORS = "--num-executors";
/**
* This is the canonical list of spark-submit options. Each entry in the array contains the
@@ -98,13 +96,11 @@ class SparkSubmitOptionParser {
{ EXECUTOR_MEMORY },
{ FILES },
{ JARS },
- { KEYTAB },
{ KILL_SUBMISSION },
{ MASTER },
{ NAME },
{ NUM_EXECUTORS },
{ PACKAGES },
- { PRINCIPAL },
{ PROPERTIES_FILE },
{ PROXY_USER },
{ PY_FILES },