diff options
| author | Andrew Or <andrewor14@gmail.com> | 2014-07-11 00:21:16 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-07-11 00:21:16 -0700 |
| commit | f4f46dec5ae1da48738b9b650d3de155b59c4674 (patch) | |
| tree | 0fb973c6f683bf3b6f06a802b240806c1c5fa1bc | |
| parent | 282cca0e49120291759ded75709013e907db598c (diff) | |
| download | spark-f4f46dec5ae1da48738b9b650d3de155b59c4674.tar.gz spark-f4f46dec5ae1da48738b9b650d3de155b59c4674.tar.bz2 spark-f4f46dec5ae1da48738b9b650d3de155b59c4674.zip | |
[Minor] Remove unused val in Master
Author: Andrew Or <andrewor14@gmail.com>
Closes #1365 from andrewor14/master-fs and squashes the following commits:
497f100 [Andrew Or] Sneak in a space and hope no one will notice
05ba6da [Andrew Or] Remove unused val
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 3 | ||||
| -rw-r--r-- | python/pyspark/java_gateway.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala index a304102a49..d9f8105992 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala @@ -72,9 +72,7 @@ private[spark] class Master( val waitingApps = new ArrayBuffer[ApplicationInfo] val completedApps = new ArrayBuffer[ApplicationInfo] var nextAppNumber = 0 - val appIdToUI = new HashMap[String, SparkUI] - val fileSystemsUsed = new HashSet[FileSystem] val drivers = new HashSet[DriverInfo] val completedDrivers = new ArrayBuffer[DriverInfo] @@ -159,7 +157,6 @@ private[spark] class Master( recoveryCompletionTask.cancel() } webUi.stop() - fileSystemsUsed.foreach(_.close()) masterMetricsSystem.stop() applicationMetricsSystem.stop() persistenceEngine.close() diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py index 0dbead4415..2a17127a7e 100644 --- a/python/pyspark/java_gateway.py +++ b/python/pyspark/java_gateway.py @@ -56,7 +56,7 @@ def launch_gateway(): (stdout, _) = proc.communicate() exit_code = proc.poll() error_msg = "Launching GatewayServer failed" - error_msg += " with exit code %d!" % exit_code if exit_code else "! " + error_msg += " with exit code %d! " % exit_code if exit_code else "! " error_msg += "(Warning: unexpected output detected.)\n\n" error_msg += gateway_port + stdout raise Exception(error_msg) |