aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2016-12-08 09:48:33 -0800
committerMarcelo Vanzin <vanzin@cloudera.com>2016-12-08 09:48:33 -0800
commitb44d1b8fcf00b238df434cf70ad09460b27adf07 (patch)
tree9caf5f4ceaae54f6b8af679b4a5cb79af4214f07
parent6a5a7254dc37952505989e9e580a14543adb730c (diff)
downloadspark-b44d1b8fcf00b238df434cf70ad09460b27adf07.tar.gz
spark-b44d1b8fcf00b238df434cf70ad09460b27adf07.tar.bz2
spark-b44d1b8fcf00b238df434cf70ad09460b27adf07.zip
[SPARK-18662][HOTFIX] Add new resource-managers directories to SparkLauncher.
These directories are added to the classpath of applications when testing or using SPARK_PREPEND_CLASSES, otherwise updated classes are not seen. Also, add the mesos directory which was missing. Author: Marcelo Vanzin <vanzin@cloudera.com> Closes #16202 from vanzin/SPARK-18662.
-rw-r--r--launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
index c7488082ca..ba43659d96 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
@@ -158,12 +158,13 @@ abstract class AbstractCommandBuilder {
"launcher",
"mllib",
"repl",
+ "resource-managers/mesos",
+ "resource-managers/yarn",
"sql/catalyst",
"sql/core",
"sql/hive",
"sql/hive-thriftserver",
- "streaming",
- "yarn"
+ "streaming"
);
if (prependClasses) {
if (!isTesting) {