Skip to content

Commit 0dace7b

Browse files
committed
[SPARK-3619] Upgrade to Mesos 0.21 to work around MESOS-1688
- MESOS_NATIVE_LIBRARY become deprecated - Chagned MESOS_NATIVE_LIBRARY to MESOS_NATIVE_JAVA_LIBRARY
1 parent 6aed719 commit 0dace7b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

conf/spark-env.sh.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# - SPARK_PUBLIC_DNS, to set the public DNS name of the driver program
1616
# - SPARK_CLASSPATH, default classpath entries to append
1717
# - SPARK_LOCAL_DIRS, storage directories to use on this node for shuffle and RDD data
18-
# - MESOS_NATIVE_LIBRARY, to point to your libmesos.so if you use Mesos
18+
# - MESOS_NATIVE_JAVA_LIBRARY, to point to your libmesos.so if you use Mesos
1919

2020
# Options read in YARN client mode
2121
# - HADOOP_CONF_DIR, to point Spark towards Hadoop configuration files

docs/running-on-mesos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ cluster, or `mesos://zk://host:2181` for a multi-master Mesos cluster using ZooK
110110
The driver also needs some configuration in `spark-env.sh` to interact properly with Mesos:
111111

112112
1. In `spark-env.sh` set some environment variables:
113-
* `export MESOS_NATIVE_LIBRARY=<path to libmesos.so>`. This path is typically
113+
* `export MESOS_NATIVE_JAVA_LIBRARY=<path to libmesos.so>`. This path is typically
114114
`<prefix>/lib/libmesos.so` where the prefix is `/usr/local` by default. See Mesos installation
115115
instructions above. On Mac OS X, the library is called `libmesos.dylib` instead of
116116
`libmesos.so`.

repl/scala-2.10/src/test/scala/org/apache/spark/repl/ReplSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ class ReplSuite extends FunSuite {
281281
assertDoesNotContain("Exception", output)
282282
}
283283

284-
if (System.getenv("MESOS_NATIVE_LIBRARY") != null) {
284+
if (System.getenv("MESOS_NATIVE_JAVA_LIBRARY") != null) {
285285
test("running on Mesos") {
286286
val output = runInterpreter("localquiet",
287287
"""

repl/scala-2.11/src/test/scala/org/apache/spark/repl/ReplSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ class ReplSuite extends FunSuite {
289289
assertDoesNotContain("Exception", output)
290290
}
291291

292-
if (System.getenv("MESOS_NATIVE_LIBRARY") != null) {
292+
if (System.getenv("MESOS_NATIVE_JAVA_LIBRARY") != null) {
293293
test("running on Mesos") {
294294
val output = runInterpreter("localquiet",
295295
"""

0 commit comments

Comments
 (0)