diff options
| author | mcheah <mcheah@palantir.com> | 2015-02-09 13:20:14 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-02-09 13:20:14 -0800 |
| commit | 6fe70d8432314f0b7290a66f114306f61e0a87cc (patch) | |
| tree | 298b9c851bf4986f6b1c6ff975b396435d7d1899 /core | |
| parent | dae216147f2247fd722fb0909da74fe71cf2fa8b (diff) | |
| download | spark-6fe70d8432314f0b7290a66f114306f61e0a87cc.tar.gz spark-6fe70d8432314f0b7290a66f114306f61e0a87cc.tar.bz2 spark-6fe70d8432314f0b7290a66f114306f61e0a87cc.zip | |
[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
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 2 |
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 b8b1a25abf..53e453990f 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 } |