From ee0ee9994846862aa5b69d67c860c2f0b1c231b4 Mon Sep 17 00:00:00 2001
From: Matthew Farrellee <matt@redhat.com>
Date: Thu, 28 Aug 2014 10:25:12 -0400
Subject: [PATCH] [SPARK-2435] Add shutdown hook to pyspark

---
 python/pyspark/shell.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py
index e1e7cd954189f..fde3c29e5e790 100644
--- a/python/pyspark/shell.py
+++ b/python/pyspark/shell.py
@@ -28,6 +28,7 @@
     sys.exit(1)
 
 
+import atexit
 import os
 import platform
 import pyspark
@@ -42,6 +43,7 @@
     SparkContext.setSystemProperty("spark.executor.uri", os.environ["SPARK_EXECUTOR_URI"])
 
 sc = SparkContext(appName="PySparkShell", pyFiles=add_files)
+atexit.register(lambda: sc.stop())
 
 print("""Welcome to
       ____              __