Skip to content

Commit

Permalink
[Minor] Remove unused val in Master
Browse files Browse the repository at this point in the history
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
  • Loading branch information
andrewor14 authored and pwendell committed Jul 11, 2014
1 parent 282cca0 commit f4f46de
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -159,7 +157,6 @@ private[spark] class Master(
recoveryCompletionTask.cancel()
}
webUi.stop()
fileSystemsUsed.foreach(_.close())
masterMetricsSystem.stop()
applicationMetricsSystem.stop()
persistenceEngine.close()
Expand Down
2 changes: 1 addition & 1 deletion python/pyspark/java_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def preexec_func():
(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)
Expand Down

0 comments on commit f4f46de

Please sign in to comment.