Skip to content

[SPARK-12386] [core] Fix NPE when spark.executor.port is set. #10339

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
wants to merge 3 commits into from
Closed

[SPARK-12386] [core] Fix NPE when spark.executor.port is set. #10339

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6911a2b
[SPARK-12386] [core] Fix NPE when spark.executor.port is set.
Dec 16, 2015
e1e67af
Use `port` when rpc env is not using it.
Dec 16, 2015
a1727ab
Simpler code.
Dec 17, 2015
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
7 changes: 6 additions & 1 deletion core/src/main/scala/org/apache/spark/SparkEnv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,12 @@ object SparkEnv extends Logging {
if (rpcEnv.isInstanceOf[AkkaRpcEnv]) {
rpcEnv.asInstanceOf[AkkaRpcEnv].actorSystem
} else {
val actorSystemPort = if (port == 0) 0 else rpcEnv.address.port + 1
val actorSystemPort =
Copy link
Contributor

@andrewor14 andrewor14 Dec 17, 2015

Choose a reason for hiding this comment

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

@markhamstra @vanzin we can make this a real oneliner if we use Option :)

val actorSystemPort = if (port == 0) 0 else Option(rpcEnv.address).map(_.port + 1).getOrElse(port)

not sure if that's easier or harder to read. Either way is fine.

Copy link
Member

@zsxwing zsxwing Dec 17, 2015

Choose a reason for hiding this comment

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

It's simpler: val actorSystemPort = if (port == 0 || rpcEnv.address == null) port else rpcEnv.address.port + 1

Copy link
Contributor

@andrewor14 andrewor14 Dec 17, 2015

Choose a reason for hiding this comment

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

+1 to @zsxwing

Copy link
Contributor Author

@vanzin vanzin Dec 17, 2015

Choose a reason for hiding this comment

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

Still doesn't fit in one line, though. But it's simpler.

if (port == 0 || rpcEnv.address == null) {
port
} else {
rpcEnv.address.port + 1
}
// Create a ActorSystem for legacy codes
AkkaUtils.createActorSystem(
actorSystemName + "ActorSystem",
Expand Down