Skip to content

Commit e9c99e3

Browse files
add log info
1 parent 107e5c5 commit e9c99e3

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

core/src/main/scala/org/apache/spark/deploy/master/Master.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,11 @@ private[spark] class Master(
366366
" Asking it to re-register.")
367367
sender ! ReconnectWorker(masterUrl)
368368
} else {
369+
// Get unknown worker's heart beat, tell the worker disconnected. And worker need to
370+
// register to this master first.
369371
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.")
371374
sender ! MasterDisconnected(masterUrl)
372375
}
373376
}

core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,12 @@ private[spark] class Worker(
466466
maybeCleanupApplication(id)
467467

468468
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+
}
470475
}
471476

472477
private def masterDisconnected() {

0 commit comments

Comments
 (0)