Skip to content
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,9 @@ private[yarn] class YarnAllocator(
* This must be synchronized because variables read in this method are mutated by other methods.
*/
def allocateResources(): Unit = synchronized {
updateResourceRequests()
val launchContainerCount =
sparkConf.getInt("spark.yarn.launchContainer.count.simultaneously", -1)
updateResourceRequests(launchContainerCount)

val progressIndicator = 0.1f
// Poll the ResourceManager. This doubles as a heartbeat if there are no pending container
Expand Down Expand Up @@ -292,9 +294,16 @@ private[yarn] class YarnAllocator(
* Visible for testing.
*/
def updateResourceRequests(): Unit = {
updateResourceRequests(-1)
}

def updateResourceRequests(maxCount : Int): Unit = {
val pendingAllocate = getPendingAllocate
val numPendingAllocate = pendingAllocate.size
val missing = targetNumExecutors - numPendingAllocate - numExecutorsRunning
var missing = targetNumExecutors - numPendingAllocate - numExecutorsRunning
if (maxCount > 0) {
missing = math.min(missing, maxCount)
}

if (missing > 0) {
logInfo(s"Will request $missing executor container(s), each with " +
Expand Down Expand Up @@ -431,18 +440,33 @@ private[yarn] class YarnAllocator(
remainingAfterOffRackMatches)
}

if (!remainingAfterOffRackMatches.isEmpty) {
logDebug(s"Releasing ${remainingAfterOffRackMatches.size} unneeded containers that were " +
var launchContainerCount =
sparkConf.getInt("spark.yarn.launchContainer.count.simultaneously", -1)
val containerNumToLaunch = {
if (launchContainerCount <= 0) {
containersToUse.size
} else {
math.min(launchContainerCount, containersToUse.size)
}
}
val filteredContainersToUse = containersToUse.drop(containersToUse.size - containerNumToLaunch)
val remainingAfterFilter
= containersToUse -- filteredContainersToUse ++ remainingAfterOffRackMatches

if (!remainingAfterFilter.isEmpty) {
logDebug(s"Releasing ${remainingAfterFilter.size} unneeded containers that were " +
s"allocated to us")
for (container <- remainingAfterOffRackMatches) {
for (container <- remainingAfterFilter) {
internalReleaseContainer(container)
}
}

runAllocatedContainers(containersToUse)
if (filteredContainersToUse.length > 0) {
runAllocatedContainers(filteredContainersToUse)
}

logInfo("Received %d containers from YARN, launching executors on %d of them."
.format(allocatedContainers.size, containersToUse.size))
.format(allocatedContainers.size, filteredContainersToUse.size))
}

/**
Expand Down