Skip to content
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.

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

Enhancement 436 #455

Merged
merged 1 commit into from Aug 14, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/main/scala/mesosphere/mesos/TaskBuilder.scala
Expand Up @@ -189,6 +189,7 @@ object TaskBuilder {
val uriProtos = app.uris.map(uri => {
CommandInfo.URI.newBuilder()
.setValue(uri)
.setExtract(isExtract(uri))
.build()
})
builder.addAllUris(uriProtos.asJava)
Expand All @@ -199,6 +200,21 @@ object TaskBuilder {
builder.build
}

private def isExtract(stringuri: String): Boolean = {
if (stringuri.endsWith(".tgz") ||
stringuri.endsWith(".tar.gz") ||
stringuri.endsWith(".tbz2") ||
stringuri.endsWith(".tar.bz2") ||
stringuri.endsWith(".txz") ||
stringuri.endsWith(".tar.xz")) {
return true;
}
else {
return false;
}

}

def environment(vars: Map[String, String]) = {
val builder = Environment.newBuilder()

Expand Down
23 changes: 23 additions & 0 deletions src/test/scala/mesosphere/mesos/TaskBuilderTest.scala
Expand Up @@ -286,6 +286,29 @@ class TaskBuilderTest extends MarathonSpec {
assert(Map.empty == env)
}

test("TaskNoURIExtraction") {

val command =
TaskBuilder.commandInfo(AppDefinition(
id = "testApp".toPath,
cpus = 1,
mem = 64,
disk = 1,
executor = "//cmd",
uris = Seq("http://www.example.com", "http://www.example.com/test.tgz",
"example.tar.gz"),
ports = Seq(8080, 8081)
), Seq(1000, 1001))

val uriinfo1 = command.getUris(0)
assert(uriinfo1.getExtract == false)
val uriinfo2 = command.getUris(1)
assert(uriinfo2.getExtract == true)
val uriinfo3 = command.getUris(2)
assert(uriinfo3.getExtract == true)

}

def buildIfMatches(offer: Offer, app: AppDefinition) = {
val taskTracker = mock[TaskTracker]

Expand Down