Skip to content
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

Jump to bottom

Fixes bugs around GpuShuffleEnv initialization #534

Merged
merged 1 commit into from
Aug 10, 2020
Merged

Fixes bugs around GpuShuffleEnv initialization #534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 25 additions & 21 deletions sql-plugin/src/main/scala/org/apache/spark/sql/rapids/GpuShuffleEnv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ class GpuShuffleEnv(rapidsConf: RapidsConf) extends Logging {
conf.get("spark.shuffle.manager") == GpuShuffleEnv.RAPIDS_SHUFFLE_CLASS
}

lazy val isRapidsShuffleEnabled: Boolean = {
val env = SparkEnv.get
val isRapidsManager = GpuShuffleEnv.isRapidsShuffleManagerInitialized
val externalShuffle = env.blockManager.externalShuffleServiceEnabled
isRapidsManager && !externalShuffle
}

def initStorage(devInfo: CudaMemInfo): Unit = {
if (isRapidsShuffleConfigured) {
Expand Down Expand Up @@ -99,31 +93,41 @@ object GpuShuffleEnv extends Logging {
private var isRapidsShuffleManagerInitialized: Boolean = false
@volatile private var env: GpuShuffleEnv = _

//
// Functions below get called from the driver or executors
//

def isRapidsShuffleEnabled: Boolean = {
val isRapidsManager = GpuShuffleEnv.isRapidsShuffleManagerInitialized
val externalShuffle = SparkEnv.get.blockManager.externalShuffleServiceEnabled
isRapidsManager && !externalShuffle
}

def setRapidsShuffleManagerInitialized(initialized: Boolean, className: String): Unit = {
assert(className == GpuShuffleEnv.RAPIDS_SHUFFLE_CLASS)
logInfo("RapidsShuffleManager is initialized")
isRapidsShuffleManagerInitialized = initialized
}

def shutdown(): Unit = {
// in the driver, this will not be set
Option(env).foreach(_.closeStorage())
}

//
// Functions below only get called from the executor
//

def init(conf: RapidsConf, devInfo: CudaMemInfo): Unit = {
Option(env).foreach(_.closeStorage())
val shuffleEnv = new GpuShuffleEnv(conf)
shuffleEnv.initStorage(devInfo)
env = shuffleEnv
}

def shutdown(): Unit = {
env.closeStorage()
}

def get: GpuShuffleEnv = env

def getCatalog: ShuffleBufferCatalog = env.getCatalog

def getReceivedCatalog: ShuffleReceivedBufferCatalog = env.getReceivedCatalog

def getDeviceStorage: RapidsDeviceMemoryStore = env.getDeviceStorage

def isRapidsShuffleEnabled: Boolean = env.isRapidsShuffleEnabled

// the shuffle plugin will call this on initialize
def setRapidsShuffleManagerInitialized(initialized: Boolean, className: String): Unit = {
assert(className == GpuShuffleEnv.RAPIDS_SHUFFLE_CLASS)
logInfo("RapidsShuffleManager is initialized")
isRapidsShuffleManagerInitialized = initialized
}
}