You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ad...@apache.org on 2014/02/17 18:52:11 UTC
git commit: Worker registration logging fix
Repository: incubator-spark
Updated Branches:
refs/heads/master 5af4477c2 -> c0795cf48
Worker registration logging fix
Author: Andrew Ash <an...@andrewash.com>
Closes #608 from ash211/patch-7 and squashes the following commits:
bd85f2a [Andrew Ash] Worker registration logging fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c0795cf4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c0795cf4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c0795cf4
Branch: refs/heads/master
Commit: c0795cf481d47425ec92f4fd0780e2e0b3fdda85
Parents: 5af4477
Author: Andrew Ash <an...@andrewash.com>
Authored: Mon Feb 17 09:51:55 2014 -0800
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Mon Feb 17 09:51:55 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/c0795cf4/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 0bb9a9a..e44f90c 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)) {