aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ash <andrew@andrewash.com>2014-02-17 09:51:55 -0800
committerAaron Davidson <aaron@databricks.com>2014-02-17 09:51:55 -0800
commitc0795cf481d47425ec92f4fd0780e2e0b3fdda85 (patch)
tree5eedb37531b7e18db4b3016d4445bab27687c9a5
parent5af4477c2b191f1ffd9814192d7017e85cf95191 (diff)
downloadspark-c0795cf481d47425ec92f4fd0780e2e0b3fdda85.tar.gz
spark-c0795cf481d47425ec92f4fd0780e2e0b3fdda85.tar.bz2
spark-c0795cf481d47425ec92f4fd0780e2e0b3fdda85.zip
Worker registration logging fix
Author: Andrew Ash <andrew@andrewash.com> Closes #608 from ash211/patch-7 and squashes the following commits: bd85f2a [Andrew Ash] Worker registration logging fix
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/master/Master.scala2
1 files changed, 1 insertions, 1 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 0bb9a9a937..e44f90c141 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
@@ -169,7 +169,7 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act
case RegisterWorker(id, workerHost, workerPort, cores, memory, workerUiPort, publicAddress) =>
{
logInfo("Registering worker %s:%d with %d cores, %s RAM".format(
- host, workerPort, cores, Utils.megabytesToString(memory)))
+ workerHost, workerPort, cores, Utils.megabytesToString(memory)))
if (state == RecoveryState.STANDBY) {
// ignore, don't send response
} else if (idToWorker.contains(id)) {