Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Fix watcher conditional logic #269

Merged
merged 2 commits into from
May 10, 2017
Merged

Fix watcher conditional logic #269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fba9d9c
Fix watcher conditional logic
erikerlandson May 8, 2017
cfc63b7
Merge branch 'branch-2.1-kubernetes' into fix-watcher-logic
ash211 May 10, 2017
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
6 changes: 4 additions & 2 deletions .../kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/v1/Client.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,9 @@ private[spark] class Client(
private class DriverEndpointsReadyWatcher(resolvedDriverEndpoints: SettableFuture[Endpoints])
extends Watcher[Endpoints] {
override def eventReceived(action: Action, endpoints: Endpoints): Unit = {
if ((action == Action.ADDED) || (action == Action.MODIFIED)
if ((action == Action.ADDED || action == Action.MODIFIED)
&& (endpoints != null)
&& (endpoints.getSubsets != null)
&& endpoints.getSubsets.asScala.nonEmpty
&& endpoints.getSubsets.asScala.exists(_.getAddresses.asScala.nonEmpty)
&& !resolvedDriverEndpoints.isDone) {
Expand All @@ -554,7 +556,7 @@ private[spark] class Client(
private class DriverServiceReadyWatcher(resolvedDriverService: SettableFuture[Service])
extends Watcher[Service] {
override def eventReceived(action: Action, service: Service): Unit = {
if ((action == Action.ADDED) || (action == Action.MODIFIED)
if ((action == Action.ADDED || action == Action.MODIFIED)
Copy link

@ash211 ash211 May 10, 2017

Choose a reason for hiding this comment

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

the parentheses change slightly modifies the evaluation order of these expressions, and the new ordering seems correct.

Java precedence for boolean expressions is ! then && then || so previously this was evaluating the && first and then the ||

&& !resolvedDriverService.isDone) {
resolvedDriverService.set(service)
}
Expand Down