Skip to content

[SPARK-14849][CORE]Always set an address for the executor #12613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skyluc wants to merge 2 commits into from
Closed

[SPARK-14849][CORE]Always set an address for the executor #12613

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cf8322
Always set an address for the executor
Apr 8, 2016
baaef11
Updates following the reviews
Apr 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/rpc/netty/NettyRpcEnv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private[netty] class NettyRpcEnv(

@Nullable
Copy link
Contributor

@rxin rxin Apr 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is no longer nullable

override lazy val address: RpcAddress = {
if (server != null) RpcAddress(host, server.getPort()) else null
if (server != null) RpcAddress(host, server.getPort()) else RpcAddress(host, -1)
Copy link
Contributor

@rxin rxin Apr 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while you are at it, we should probably document when server is null and explain the choices here

Copy link
Member

@zsxwing zsxwing May 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-1 is actually confusing. All of executors in the same node will have the same address.

}

override def setupEndpoint(name: String, endpoint: RpcEndpoint): RpcEndpointRef = {
Expand Down
8 changes: 1 addition & 7 deletions core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,7 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, val rpcEnv: Rp
executorRef.send(RegisterExecutorFailed("Duplicate executor ID: " + executorId))
context.reply(true)
} else {
// If the executor's rpc env is not listening for incoming connections, `hostPort`
// will be null, and the client connection should be used to contact the executor.
val executorAddress = if (executorRef.address != null) {
executorRef.address
} else {
context.senderAddress
}
val executorAddress = executorRef.address
logInfo(s"Registered executor $executorRef ($executorAddress) with ID $executorId")
addressToExecutorId(executorAddress) = executorId
totalCoreCount.addAndGet(cores)
Expand Down