You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/07/11 09:21:21 UTC
git commit: [Minor] Remove unused val in Master
Repository: spark
Updated Branches:
refs/heads/master 282cca0e4 -> f4f46dec5
[Minor] Remove unused val in Master
Author: Andrew Or <an...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f4f46dec
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f4f46dec
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f4f46dec
Branch: refs/heads/master
Commit: f4f46dec5ae1da48738b9b650d3de155b59c4674
Parents: 282cca0
Author: Andrew Or <an...@gmail.com>
Authored: Fri Jul 11 00:21:16 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Jul 11 00:21:16 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 3 ---
python/pyspark/java_gateway.py | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f4f46dec/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
----------------------------------------------------------------------
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 a304102..d9f8105 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()
http://git-wip-us.apache.org/repos/asf/spark/blob/f4f46dec/python/pyspark/java_gateway.py
----------------------------------------------------------------------
diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py
index 0dbead4..2a17127 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)