spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andrewo...@apache.org
Subject spark git commit: [SPARK-5691] Fixing wrong data structure lookup for dupe app registratio...
Date Mon, 09 Feb 2015 21:20:22 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.3 43972b5d1 -> 6a0144c63


[SPARK-5691] Fixing wrong data structure lookup for dupe app registratio...

In Master's registerApplication method, it checks if the application had
already registered by examining the addressToWorker hash map. In reality,
it should refer to the addressToApp data structure, as this is what
really tracks which apps have been registered.

Author: mcheah <mcheah@palantir.com>

Closes #4477 from mccheah/spark-5691 and squashes the following commits:

efdc573 [mcheah] [SPARK-5691] Fixing wrong data structure lookup for dupe app registration

(cherry picked from commit 6fe70d8432314f0b7290a66f114306f61e0a87cc)
Signed-off-by: Andrew Or <andrew@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6a0144c6
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6a0144c6
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6a0144c6

Branch: refs/heads/branch-1.3
Commit: 6a0144c63414bb3bbf181810dbe317d727ace201
Parents: 43972b5
Author: mcheah <mcheah@palantir.com>
Authored: Mon Feb 9 13:20:14 2015 -0800
Committer: Andrew Or <andrew@databricks.com>
Committed: Mon Feb 9 13:20:19 2015 -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/spark/blob/6a0144c6/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 b8b1a25..53e4539 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
@@ -671,7 +671,7 @@ private[spark] class Master(
 
   def registerApplication(app: ApplicationInfo): Unit = {
     val appAddress = app.driver.path.address
-    if (addressToWorker.contains(appAddress)) {
+    if (addressToApp.contains(appAddress)) {
       logInfo("Attempted to re-register application at same address: " + appAddress)
       return
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message