Skip to content

Commit f4f46de

Browse files
andrewor14pwendell
authored andcommitted
[Minor] Remove unused val in Master
Author: Andrew Or <[email protected]> Closes apache#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
1 parent 282cca0 commit f4f46de

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

core/src/main/scala/org/apache/spark/deploy/master/Master.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ private[spark] class Master(
7272
val waitingApps = new ArrayBuffer[ApplicationInfo]
7373
val completedApps = new ArrayBuffer[ApplicationInfo]
7474
var nextAppNumber = 0
75-
7675
val appIdToUI = new HashMap[String, SparkUI]
77-
val fileSystemsUsed = new HashSet[FileSystem]
7876

7977
val drivers = new HashSet[DriverInfo]
8078
val completedDrivers = new ArrayBuffer[DriverInfo]
@@ -159,7 +157,6 @@ private[spark] class Master(
159157
recoveryCompletionTask.cancel()
160158
}
161159
webUi.stop()
162-
fileSystemsUsed.foreach(_.close())
163160
masterMetricsSystem.stop()
164161
applicationMetricsSystem.stop()
165162
persistenceEngine.close()

python/pyspark/java_gateway.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def preexec_func():
5656
(stdout, _) = proc.communicate()
5757
exit_code = proc.poll()
5858
error_msg = "Launching GatewayServer failed"
59-
error_msg += " with exit code %d!" % exit_code if exit_code else "! "
59+
error_msg += " with exit code %d! " % exit_code if exit_code else "! "
6060
error_msg += "(Warning: unexpected output detected.)\n\n"
6161
error_msg += gateway_port + stdout
6262
raise Exception(error_msg)

0 commit comments

Comments
 (0)