Skip to content

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

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 4 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0b108b
Fixed split command in TaskLocation to allow for _ in executor id.
tmagrino Jun 22, 2016
c2f0a2c
Code style fix.
tmagrino Jun 22, 2016
0aed80a
Refactored code and added test case.
tmagrino Jun 28, 2016
ee4708d
Tweak to use require and array deconstruction for cleaner code.
tmagrino Jun 28, 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
14 changes: 7 additions & 7 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,18 +64,18 @@ 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 executor_[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)) {
Copy link
Member

@srowen srowen Jun 28, 2016

Choose a reason for hiding this comment

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

Not related to your change, but this method could be further clarified, like by just checking upfront whether the string starts with inMemoryLocationTag and returning that case straight away. Not required here. The logic looks sound now that the comments are updated.

if (str.startsWith(executorLocationTag)) {
val splits = str.split("_")
if (splits.length != 3) {
throw new IllegalArgumentException("Illegal executor location format: " + str)
}
new ExecutorCacheTaskLocation(splits(1), splits(2))
val hostAndExecutorId = str.stripPrefix(executorLocationTag)
val splits = hostAndExecutorId.split("_", 2)
require(splits.length == 2, "Illegal executor location format: " + str)
Copy link
Member

@srowen srowen Jun 28, 2016

Choose a reason for hiding this comment

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

You can use string interpolation here but not worth changing if that's the only thing left

val Array(host, executorId) = splits
Copy link
Contributor

@rxin rxin Jun 29, 2016

Choose a reason for hiding this comment

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

it's usually better to just do splits(0) and splits(1) rather than using pattern matching here.

new ExecutorCacheTaskLocation(host, executorId)
} else {
new HostTaskLocation(str)
}
Expand Down
2 changes: 2 additions & 0 deletions core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,8 @@ class TaskSetManagerSuite extends SparkFunSuite with LocalSparkContext with Logg
assert(TaskLocation("host1") === HostTaskLocation("host1"))
assert(TaskLocation("hdfs_cache_host1") === HDFSCacheTaskLocation("host1"))
assert(TaskLocation("executor_host1_3") === ExecutorCacheTaskLocation("host1", "3"))
assert(TaskLocation("executor_some.host1_executor_task_3") ===
ExecutorCacheTaskLocation("some.host1", "executor_task_3"))
}

test("Kill other task attempts when one attempt belonging to the same task succeeds") {
Expand Down