-
Notifications
You must be signed in to change notification settings - Fork 28.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SPARK-2269 Refactor mesos scheduler resourceOffers and add unit test
Author: Timothy Chen <tnachen@gmail.com> Closes #1487 from tnachen/resource_offer_refactor and squashes the following commits: 4ea5dec [Timothy Chen] Rebase from master and address comments 9ccab09 [Timothy Chen] Address review comments e6494dc [Timothy Chen] Refactor class loading 8207428 [Timothy Chen] Refactor mesos scheduler resourceOffers and add unit test
- Loading branch information
Showing
2 changed files
with
152 additions
and
79 deletions.
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
94 changes: 94 additions & 0 deletions
94
core/src/test/scala/org/apache/spark/scheduler/mesos/MesosSchedulerBackendSuite.scala
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,94 @@ | ||
/* | ||
* 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.scheduler.mesos | ||
|
||
import org.scalatest.FunSuite | ||
import org.apache.spark.{scheduler, SparkConf, SparkContext, LocalSparkContext} | ||
import org.apache.spark.scheduler.{TaskDescription, WorkerOffer, TaskSchedulerImpl} | ||
import org.apache.spark.scheduler.cluster.mesos.{MemoryUtils, MesosSchedulerBackend} | ||
import org.apache.mesos.SchedulerDriver | ||
import org.apache.mesos.Protos._ | ||
import org.scalatest.mock.EasyMockSugar | ||
import org.apache.mesos.Protos.Value.Scalar | ||
import org.easymock.{Capture, EasyMock} | ||
import java.nio.ByteBuffer | ||
import java.util.Collections | ||
import java.util | ||
import scala.collection.mutable | ||
|
||
class MesosSchedulerBackendSuite extends FunSuite with LocalSparkContext with EasyMockSugar { | ||
test("mesos resource offer is launching tasks") { | ||
def createOffer(id: Int, mem: Int, cpu: Int) = { | ||
val builder = Offer.newBuilder() | ||
builder.addResourcesBuilder() | ||
.setName("mem") | ||
.setType(Value.Type.SCALAR) | ||
.setScalar(Scalar.newBuilder().setValue(mem)) | ||
builder.addResourcesBuilder() | ||
.setName("cpus") | ||
.setType(Value.Type.SCALAR) | ||
.setScalar(Scalar.newBuilder().setValue(cpu)) | ||
builder.setId(OfferID.newBuilder().setValue(id.toString).build()).setFrameworkId(FrameworkID.newBuilder().setValue("f1")) | ||
.setSlaveId(SlaveID.newBuilder().setValue("s1")).setHostname("localhost").build() | ||
} | ||
|
||
val driver = EasyMock.createMock(classOf[SchedulerDriver]) | ||
val taskScheduler = EasyMock.createMock(classOf[TaskSchedulerImpl]) | ||
|
||
val sc = EasyMock.createMock(classOf[SparkContext]) | ||
|
||
EasyMock.expect(sc.executorMemory).andReturn(100).anyTimes() | ||
EasyMock.expect(sc.getSparkHome()).andReturn(Option("/path")).anyTimes() | ||
EasyMock.expect(sc.executorEnvs).andReturn(new mutable.HashMap).anyTimes() | ||
EasyMock.expect(sc.conf).andReturn(new SparkConf).anyTimes() | ||
EasyMock.replay(sc) | ||
val minMem = MemoryUtils.calculateTotalMemory(sc).toInt | ||
val minCpu = 4 | ||
val offers = new java.util.ArrayList[Offer] | ||
offers.add(createOffer(1, minMem, minCpu)) | ||
offers.add(createOffer(1, minMem - 1, minCpu)) | ||
val backend = new MesosSchedulerBackend(taskScheduler, sc, "master") | ||
val workerOffers = Seq(offers.get(0)).map(o => new WorkerOffer( | ||
o.getSlaveId.getValue, | ||
o.getHostname, | ||
2 | ||
)) | ||
val taskDesc = new TaskDescription(1L, "s1", "n1", 0, ByteBuffer.wrap(new Array[Byte](0))) | ||
EasyMock.expect(taskScheduler.resourceOffers(EasyMock.eq(workerOffers))).andReturn(Seq(Seq(taskDesc))) | ||
EasyMock.expect(taskScheduler.CPUS_PER_TASK).andReturn(2).anyTimes() | ||
EasyMock.replay(taskScheduler) | ||
val capture = new Capture[util.Collection[TaskInfo]] | ||
EasyMock.expect( | ||
driver.launchTasks( | ||
EasyMock.eq(Collections.singleton(offers.get(0).getId)), | ||
EasyMock.capture(capture), | ||
EasyMock.anyObject(classOf[Filters]) | ||
) | ||
).andReturn(Status.valueOf(1)) | ||
EasyMock.expect(driver.declineOffer(offers.get(1).getId)).andReturn(Status.valueOf(1)) | ||
EasyMock.replay(driver) | ||
backend.resourceOffers(driver, offers) | ||
assert(capture.getValue.size() == 1) | ||
val taskInfo = capture.getValue.iterator().next() | ||
assert(taskInfo.getName.equals("n1")) | ||
val cpus = taskInfo.getResourcesList.get(0) | ||
assert(cpus.getName.equals("cpus")) | ||
assert(cpus.getScalar.getValue.equals(2.0)) | ||
assert(taskInfo.getSlaveId.getValue.equals("s1")) | ||
} | ||
} |