[SPARK-25299] Yet another attempt to integrate API with scheduler #559
+779
−126
There are no files selected for viewing
This file contains 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 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 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,38 @@ | ||
| /* | ||
| * 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.api.shuffle; | ||
|
|
||
| import org.apache.spark.annotation.Experimental; | ||
|
|
||
| /** | ||
| * :: Experimental :: | ||
| * An interface for interaction with shuffle locations. | ||
| * | ||
| * @since 3.0.0 | ||
| */ | ||
| @Experimental | ||
| public interface ShuffleLocationComponents { | ||
|
|
||
| /** | ||
| * Returns whether the MapShuffleLocations now has missing data based on the | ||
| * removal of the lost shuffle location. | ||
| */ | ||
| boolean shouldRemoveMapOutputOnLostBlock( | ||
| ShuffleLocation lostLocation, | ||
| MapShuffleLocations mapOutputLocations); | ||
| } |
This file contains 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 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,50 @@ | ||
| /* | ||
| * 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.shuffle.sort.io; | ||
|
|
||
| import org.apache.spark.SparkConf; | ||
| import org.apache.spark.api.shuffle.MapShuffleLocations; | ||
| import org.apache.spark.api.shuffle.ShuffleLocation; | ||
| import org.apache.spark.api.shuffle.ShuffleLocationComponents; | ||
| import org.apache.spark.internal.config.package$; | ||
| import org.apache.spark.shuffle.sort.DefaultMapShuffleLocations; | ||
|
|
||
| public class DefaultShuffleLocationComponents implements ShuffleLocationComponents { | ||
|
|
||
| private final boolean externalShuffleServiceEnabled; | ||
| private final boolean unRegisterOutputHostOnFetchFailure; | ||
|
|
||
| public DefaultShuffleLocationComponents(SparkConf sparkConf) { | ||
| externalShuffleServiceEnabled = (boolean) sparkConf.get(package$.MODULE$.SHUFFLE_SERVICE_ENABLED()); | ||
| unRegisterOutputHostOnFetchFailure = (boolean) | ||
| sparkConf.get(package$.MODULE$.UNREGISTER_OUTPUT_ON_HOST_ON_FETCH_FAILURE()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean shouldRemoveMapOutputOnLostBlock( | ||
| ShuffleLocation lostLocation, | ||
| MapShuffleLocations mapOutputLocations) { | ||
| DefaultMapShuffleLocations mapStatusLoc = (DefaultMapShuffleLocations) mapOutputLocations; | ||
| DefaultMapShuffleLocations lostLoc = (DefaultMapShuffleLocations) lostLocation; | ||
| if (externalShuffleServiceEnabled && unRegisterOutputHostOnFetchFailure) { | ||
| return mapStatusLoc.getBlockManagerId().host().equals(lostLoc.getBlockManagerId().host()); | ||
| } else { | ||
| return mapStatusLoc.getBlockManagerId().executorId().equals(lostLoc.getBlockManagerId().executorId()); | ||
| } | ||
| } | ||
| } |
This file contains 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 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 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 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.
I think I understand what's going on with
removeMapAtLocation, but I'm confused by this part. When there is a fetch failure from host X for map M from reduce R, the dagscheduler removes shuffle outputs two different ways (no idea why) -- (1) it uses the path you're changing below inremoveMapAtLocationto remove all map output on host X. I see how you're changing that part below to move logic into theShuffleLocationComponent. (2) here, it is removing the Map M from host X. before this change, it removes the entire map output of Map M. You're changing it to take in the reduce R as a parameter, but still removing all map output of Map M (mapStatus(mapId) = null), which doesn't seem consistent.Or is there some special logic in the extra condition
mapStatuses(mapId).mapShuffleLocations.getLocationForBlock(reduceId) == shuffleLoc? I guess I don't understand when it would be true or false -- seems like it should always be true. Can oneShuffleLocationreally represent multiple locations? I'd still expect them to be equal here, as the mapOutputTracker would have stored multiple locations, and the fetch failure would also send back multiple locations, right?(above discussion ignores the host / executor distinction for external shuffle service in current implementation just to keep things "simple")
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.
Oh the first point about this function taking a reducer parameter R, it's using R to validate that the
ShuffleLocationdoes indeed exist in the MapStatus for mapper M. I was doing this to mimic the previous behavior where you're checking that thebmAddressexists in the MapStatus before removing it, although I wasn't exactly sure why one would need to check (could it be that we might have received an obsolete FetchFailed?). However, you're right that I can replace themapStatuses(mapId).mapShuffleLocations.getLocationForBlock(reduceId) == shuffleLoclogic with something that calls into the logic insideShuffleLocationComponent, which would be more consistent.On the note about
ShuffleLocationrepresenting multiple locations: yup that's right, I tried to code up what that would look like inDAGSchedulerFileServerSuite. Fetch failure would then send back a singleShuffleLocationthat encodes multiple host/port combos.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.
Can an obsolete FetchFailed be a problem, I would leave the check
Does order in the multiple host/port combos matter in this equality check?