[SPARK-17696][core] Partial backport of SPARK-12330 to branch-1.6. #15270
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From the original commit message: This PR also fixes a regression caused by [SPARK-10987] whereby submitting a shutdown causes a race between the local shutdown procedure and the notification of the scheduler driver disconnection. If the scheduler driver disconnection wins the race, the coarse executor incorrectly exits with status 1 (instead of the proper status 0) Author: Charles Allen <charles@allen-net.com> (cherry picked from commit 2eaeafe)
|
Test build #66002 has finished for PR 15270 at commit
|
|
Let's see if someone in interested in looking at this... @zsxwing ? |
zsxwing
reviewed
Sep 28, 2016
| @@ -45,6 +46,7 @@ private[spark] class CoarseGrainedExecutorBackend( | |||
| env: SparkEnv) | |||
| extends ThreadSafeRpcEndpoint with ExecutorBackend with Logging { | |||
|
|
|||
| private[this] val stopping = new AtomicBoolean(false) | |||
There was a problem hiding this comment.
Nit: This can be just a simple var since this is a ThreadSafeRpcEndpoint
There was a problem hiding this comment.
This is the same as in master, I'd rather keep the code the same. If you really care, it's better to change it on master.
|
LGTM except a nit. |
|
Okey. I'm going to merge it. We can change it in another PR on master. |
asfgit
pushed a commit
that referenced
this pull request
Sep 28, 2016
From the original commit message: This PR also fixes a regression caused by [SPARK-10987] whereby submitting a shutdown causes a race between the local shutdown procedure and the notification of the scheduler driver disconnection. If the scheduler driver disconnection wins the race, the coarse executor incorrectly exits with status 1 (instead of the proper status 0) Author: Charles Allen <charlesallen-net.com> (cherry picked from commit 2eaeafe) Author: Charles Allen <charles@allen-net.com> Closes #15270 from vanzin/SPARK-17696.
|
@vanzin Merged. Could you close this PR, please? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
From the original commit message:
This PR also fixes a regression caused by [SPARK-10987] whereby submitting a shutdown causes a race between the local shutdown procedure and the notification of the scheduler driver disconnection. If the scheduler driver disconnection wins the race, the coarse executor incorrectly exits with status 1 (instead of the proper status 0)
Author: Charles Allen charles@allen-net.com
(cherry picked from commit 2eaeafe)