File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed
core/src/main/scala/org/apache/spark/deploy Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -366,8 +366,11 @@ private[spark] class Master(
366
366
" Asking it to re-register." )
367
367
sender ! ReconnectWorker (masterUrl)
368
368
} else {
369
+ // Get unknown worker's heart beat, tell the worker disconnected. And worker need to
370
+ // register to this master first.
369
371
logWarning(s " Got heartbeat from unregistered worker $workerId. " +
370
- " This worker was never registered, so ignoring the heartbeat." )
372
+ " This worker was never registered, tell the worker connection is disconnected." +
373
+ " Need to re-register if want to connect." )
371
374
sender ! MasterDisconnected (masterUrl)
372
375
}
373
376
}
Original file line number Diff line number Diff line change @@ -466,7 +466,12 @@ private[spark] class Worker(
466
466
maybeCleanupApplication(id)
467
467
468
468
case MasterDisconnected (masterUrl) =>
469
- masterDisconnected()
469
+ if (masterUrl != activeMasterUrl) {
470
+ logWarning(s " Get message from Invalid Master ( $masterUrl). " +
471
+ s " Valid Master is : $activeMasterUrl, so ignore the message. " )
472
+ } else {
473
+ masterDisconnected()
474
+ }
470
475
}
471
476
472
477
private def masterDisconnected () {
You can’t perform that action at this time.
0 commit comments