From 2fd2752e572921a9010614eb1c1238c493d34a7c Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <boukevanderbijl@gmail.com>
Date: Thu, 8 May 2014 20:43:37 -0700
Subject: [PATCH] Include the sbin/spark-config.sh in spark-executor

This is needed because broadcast values are broken on pyspark on Mesos, it tries to import pyspark but can't, as the PYTHONPATH is not set due to changes in ff5be9a4

https://issues.apache.org/jira/browse/SPARK-1725

Author: Bouke van der Bijl <boukevanderbijl@gmail.com>

Closes #651 from bouk/include-spark-config-in-mesos-executor and squashes the following commits:

b2f1295 [Bouke van der Bijl] Inline PYTHONPATH in spark-executor
eedbbcc [Bouke van der Bijl] Include the sbin/spark-config.sh in spark-executor
---
 sbin/spark-executor | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sbin/spark-executor b/sbin/spark-executor
index de5bfab563..336549f29c 100755
--- a/sbin/spark-executor
+++ b/sbin/spark-executor
@@ -19,5 +19,8 @@
 
 FWDIR="$(cd `dirname $0`/..; pwd)"
 
+export PYTHONPATH=$FWDIR/python:$PYTHONPATH
+export PYTHONPATH=$FWDIR/python/lib/py4j-0.8.1-src.zip:$PYTHONPATH
+
 echo "Running spark-executor with framework dir = $FWDIR"
 exec $FWDIR/bin/spark-class org.apache.spark.executor.MesosExecutorBackend
-- 
GitLab