Repository: incubator-spark Updated Branches: refs/heads/branch-0.9 e797c1abd -> b0b5288aa
Worker registration logging fix Author: Andrew Ash <and...@andrewash.com> Closes #608 from ash211/patch-7 and squashes the following commits: bd85f2a [Andrew Ash] Worker registration logging fix (cherry picked from commit c0795cf481d47425ec92f4fd0780e2e0b3fdda85) Signed-off-by: Aaron Davidson <aa...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/b0b5288a Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/b0b5288a Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/b0b5288a Branch: refs/heads/branch-0.9 Commit: b0b5288aad408511ea26b97b1d6be693d588def1 Parents: e797c1a Author: Andrew Ash <and...@andrewash.com> Authored: Mon Feb 17 09:51:55 2014 -0800 Committer: Aaron Davidson <aa...@databricks.com> Committed: Mon Feb 17 09:52:16 2014 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/b0b5288a/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 7be7749..3897156 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 @@ -168,7 +168,7 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act case RegisterWorker(id, workerHost, workerPort, cores, memory, workerWebUiPort, 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)) {
