github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12091 from mwielgus/spark-flaky

Browse Source 
Fix spark-driver in examples/spark
This commit is contained in:
Dawn Chen 2015-08-05 12:03:34 -07:00
commit 13258e8f8f
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/spark/images/driver/Dockerfile
View File

@ -1,4 +1,3 @@
FROM gcr.io/google_containers/spark-base FROM gcr.io/google_containers/spark-base
ADD start.sh /start.sh ADD start.sh /start.sh
ADD log4j.properties /opt/spark/conf/log4j.properties
CMD ["/start.sh"] CMD ["/start.sh"]

2
examples/spark/images/driver/start.sh
View File

@ -17,7 +17,7 @@
echo "$SPARK_MASTER_SERVICE_HOST spark-master" >> /etc/hosts echo "$SPARK_MASTER_SERVICE_HOST spark-master" >> /etc/hosts
echo "SPARK_LOCAL_HOSTNAME=$(hostname -i)" >> /opt/spark/conf/spark-env.sh echo "SPARK_LOCAL_HOSTNAME=$(hostname -i)" >> /opt/spark/conf/spark-env.sh
echo "MASTER=spark://spark-master:$SPARK_MASTER_SERVICE_PORT" >> /opt/spark/conf/spark-env.sh echo "MASTER=spark://spark-master:$SPARK_MASTER_SERVICE_PORT" >> /opt/spark/conf/spark-env.sh
echo "Use kubectl exec spark-driver -it bash to invoke commands"
while true; do while true; do
sleep 100 sleep 100
done done

2
examples/spark/spark-driver.json
View File

@ -11,7 +11,7 @@
"containers": [ "containers": [
{ {
"name": "spark-driver", "name": "spark-driver",
"image": "gurvin/spark-driver", "image": "gcr.io/google_containers/spark-driver:1.4.0_v1",
"resources": { "resources": {
"limits": { "limits": {
"cpu": "100m" "cpu": "100m"

2
test/e2e/examples.go
View File

@ -189,7 +189,7 @@ var _ = Describe("Examples e2e", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
_, err = lookForStringInLog(ns, "spark-master", "spark-master", "Starting Spark master at", serverStartTimeout) _, err = lookForStringInLog(ns, "spark-master", "spark-master", "Starting Spark master at", serverStartTimeout)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
_, err = lookForStringInLog(ns, "spark-driver", "spark-driver", "Starting Spark driver at", serverStartTimeout) _, err = lookForStringInLog(ns, "spark-driver", "spark-driver", "Use kubectl exec", serverStartTimeout)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("starting workers") By("starting workers")