Skip to content

[SPARK-16148] [Scheduler] Allow for underscores in TaskLocation in the Executor ID #13857

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

[SPARK-16148] [Scheduler] Allow for underscores in TaskLocation in the Executor ID #13857

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0402210
Fixed split command in TaskLocation to allow for _ in executor id.
tmagrino Jun 22, 2016
00fa601
Code style fix.
tmagrino Jun 22, 2016
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
6 changes: 3 additions & 3 deletions core/src/main/scala/org/apache/spark/scheduler/TaskLocation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ private[spark] object TaskLocation {

/**
* Create a TaskLocation from a string returned by getPreferredLocations.
* These strings have the form [hostname] or hdfs_cache_[hostname], depending on whether the
* location is cached.
* These strings have the form [executorLocationTag][hostname][executorid], [hostname], or
* hdfs_cache_[hostname], depending on whether the location is cached.
*/
def apply(str: String): TaskLocation = {
val hstr = str.stripPrefix(inMemoryLocationTag)
if (hstr.equals(str)) {
if (str.startsWith(executorLocationTag)) {
val splits = str.split("_")
val splits = str.split("_", 3)
Copy link
Member

@srowen srowen Jun 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, probably even more robust to just use stripPrefix here? this whole method could be a little clearer anyway

if (splits.length != 3) {
throw new IllegalArgumentException("Illegal executor location format: " + str)
}
Expand Down