Skip to content

[SPARK-3101] Missing volatile annotation in ApplicationMaster #2016

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

[SPARK-3101] Missing volatile annotation in ApplicationMaster #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b89201
Modified field variable 'isLastAmRetry' as volatile
sarutak Aug 18, 2014
92c25ca
Merge branch 'master' of git://git.apache.org/spark into SPARK-3101
sarutak Aug 19, 2014
194460f
Add volatile modifier to flag fields
sarutak Aug 19, 2014
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
5 changes: 2 additions & 3 deletions yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.spark.deploy.yarn

import java.io.IOException
import java.net.Socket
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.atomic.{AtomicInteger, AtomicReference}

Expand Down Expand Up @@ -58,12 +57,12 @@ class ApplicationMaster(args: ApplicationMasterArguments, conf: Configuration,
private val fs = FileSystem.get(yarnConf)

private var yarnAllocator: YarnAllocationHandler = _
private var isFinished: Boolean = false
@volatile private var isFinished: Boolean = false
private var uiAddress: String = _
private var uiHistoryAddress: String = _
private val maxAppAttempts: Int = conf.getInt(YarnConfiguration.RM_AM_MAX_RETRIES,
YarnConfiguration.DEFAULT_RM_AM_MAX_RETRIES)
private var isLastAMRetry: Boolean = true
@volatile private var isLastAMRetry: Boolean = true

// Default to numExecutors * 2, with minimum of 3
private val maxNumExecutorFailures = sparkConf.getInt("spark.yarn.max.executor.failures",
Expand Down
2 changes: 1 addition & 1 deletion yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class ExecutorLauncher(args: ApplicationMasterArguments, conf: Configuration, sp
private var yarnAllocator: YarnAllocationHandler = _

private var driverClosed: Boolean = false
private var isFinished: Boolean = false
@volatile private var isFinished: Boolean = false
private var registered: Boolean = false

// Default to numExecutors * 2, with minimum of 3
Expand Down
4 changes: 2 additions & 2 deletions yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ class ApplicationMaster(args: ApplicationMasterArguments, conf: Configuration,
private val fs = FileSystem.get(yarnConf)

private var yarnAllocator: YarnAllocationHandler = _
private var isFinished: Boolean = false
@volatile private var isFinished: Boolean = false
private var uiAddress: String = _
private var uiHistoryAddress: String = _
private val maxAppAttempts: Int = conf.getInt(
YarnConfiguration.RM_AM_MAX_ATTEMPTS, YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS)
private var isLastAMRetry: Boolean = true
@volatile private var isLastAMRetry: Boolean = true
private var amClient: AMRMClient[ContainerRequest] = _

// Default to numExecutors * 2, with minimum of 3
Expand Down
2 changes: 1 addition & 1 deletion yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class ExecutorLauncher(args: ApplicationMasterArguments, conf: Configuration, sp

private var yarnAllocator: YarnAllocationHandler = _
private var driverClosed: Boolean = false
private var isFinished: Boolean = false
@volatile private var isFinished: Boolean = false
private var registered: Boolean = false

private var amClient: AMRMClient[ContainerRequest] = _
Expand Down