[MESOS][SPARK-8873] Clean up external shuffle data on driver exit with Mesos. #7820
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.deploy.mesos | ||
|
|
||
| import java.net.SocketAddress | ||
| import java.util.concurrent.CountDownLatch | ||
|
|
||
| import org.apache.spark.deploy.ExternalShuffleService | ||
| import org.apache.spark.network.client.{RpcResponseCallback, TransportClient} | ||
| import org.apache.spark.network.netty.SparkTransportConf | ||
| import org.apache.spark.network.shuffle.ExternalShuffleBlockHandler | ||
| import org.apache.spark.network.shuffle.protocol.BlockTransferMessage | ||
| import org.apache.spark.network.shuffle.protocol.mesos.RegisterDriver | ||
| import org.apache.spark.network.util.TransportConf | ||
| import org.apache.spark.util.Utils | ||
| import org.apache.spark.{Logging, SecurityManager, SparkConf} | ||
|
|
||
| import scala.collection.mutable | ||
|
|
||
|
|
||
| /** | ||
| * MesosExternalShuffleServiceEndpoint is a RPC endpoint that receives | ||
|
Contributor
There was a problem hiding this comment. nit: just start with |
||
| * registration requests from Spark drivers launched with Mesos. | ||
| * It detects driver termination and calls the cleanup callback to [[ExternalShuffleService]] | ||
| */ | ||
| private[mesos] class MesosExternalShuffleBlockHandler(transportConf: TransportConf) | ||
| extends ExternalShuffleBlockHandler(transportConf) with Logging { | ||
|
|
||
| // Stores a map of driver socket addresses to app ids | ||
| private val connectedApps = new mutable.HashMap[SocketAddress, String] | ||
|
|
||
| protected override def handleMessage( | ||
| message: BlockTransferMessage, | ||
| client: TransportClient, | ||
| callback: RpcResponseCallback): Unit = { | ||
| message match { | ||
| case RegisterDriverParam(appId) => | ||
| val address = client.getSocketAddress() | ||
| logDebug(s"Received registration request from app $appId, address $address") | ||
| if (connectedApps.contains(address)) { | ||
| val existingAppId: String = connectedApps(address) | ||
| if (!existingAppId.equals(appId)) { | ||
| logError(s"A new app id $appId has connected to existing address $address" + | ||
| s", removing registered app $existingAppId") | ||
| applicationRemoved(existingAppId, true) | ||
|
Contributor
There was a problem hiding this comment. can you name this boolean parameter, e.g. |
||
| } | ||
| } | ||
| connectedApps(address) = appId | ||
| callback.onSuccess(new Array[Byte](0)) | ||
| case _ => super.handleMessage(message, client, callback) | ||
| } | ||
| } | ||
|
|
||
| override def connectionTerminated(client: TransportClient): Unit = { | ||
| val address = client.getSocketAddress() | ||
| if (connectedApps.contains(address)) { | ||
| val appId = connectedApps(address) | ||
| logInfo(s"Application $appId disconnected (address was $address)") | ||
| applicationRemoved(appId, true) | ||
| connectedApps.remove(address) | ||
| } else { | ||
| logWarning(s"Address $address not found in mesos shuffle service") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * An extractor object for matching RegisterDriver message. | ||
| */ | ||
| private[mesos] object RegisterDriverParam { | ||
|
Contributor
There was a problem hiding this comment. this could be strictly |
||
| def unapply(r: RegisterDriver): Option[String] = Some(r.getAppId()) | ||
| } | ||
|
|
||
| /** | ||
| * MesosExternalShuffleService wraps [[ExternalShuffleService]] which provides an additional | ||
| * endpoint for drivers to associate with. This allows the shuffle service to detect when | ||
| * a driver is terminated and can further clean up the cached shuffle data. | ||
|
Contributor
There was a problem hiding this comment. technically incorrect: shuffle data is not cached. Just say the |
||
| */ | ||
| private[mesos] class MesosExternalShuffleService( | ||
| conf: SparkConf, | ||
| securityManager: SecurityManager, | ||
| transportConf: TransportConf) | ||
| extends ExternalShuffleService( | ||
| conf, securityManager, transportConf, new MesosExternalShuffleBlockHandler(transportConf)) { | ||
| } | ||
|
|
||
| private[spark] object MesosExternalShuffleService extends Logging { | ||
|
Contributor
There was a problem hiding this comment. this whole thing is duplicated from
Contributor
There was a problem hiding this comment. never mind you can't extend objects. |
||
| val SYSTEM_NAME = "mesosExternalShuffleService" | ||
| val ENDPOINT_NAME = "mesosExternalShuffleServiceEndpoint" | ||
|
Contributor
There was a problem hiding this comment. not used, please clean up the code after an update |
||
|
|
||
| @volatile | ||
| private var server: MesosExternalShuffleService = _ | ||
|
|
||
| private val barrier = new CountDownLatch(1) | ||
|
|
||
| def main(args: Array[String]): Unit = { | ||
| val sparkConf = new SparkConf | ||
| Utils.loadDefaultSparkProperties(sparkConf) | ||
| val securityManager = new SecurityManager(sparkConf) | ||
|
|
||
| // we override this value since this service is started from the command line | ||
| // and we assume the user really wants it to be running | ||
| sparkConf.set("spark.shuffle.service.enabled", "true") | ||
| val transportConf = SparkTransportConf.fromSparkConf(sparkConf, numUsableCores = 0) | ||
| server = new MesosExternalShuffleService( | ||
| sparkConf, securityManager, transportConf) | ||
| server.start() | ||
|
|
||
| installShutdownHook() | ||
|
|
||
| // keep running until the process is terminated | ||
| barrier.await() | ||
| } | ||
|
|
||
| private def installShutdownHook(): Unit = { | ||
| Runtime.getRuntime.addShutdownHook( | ||
| new Thread("Mesos External Shuffle Service shutdown thread") { | ||
| override def run() { | ||
| logInfo("Shutting down Mesos shuffle service.") | ||
| server.stop() | ||
| barrier.countDown() | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
|
|
||
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This interface is confusing: we pass in both a
SparkConfand aTransportConf, even though one is created from another one.