HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D36

Enhanced MarathonSchedulerActorTest https://github.com/mesosphere/marathon/issues/4534
ClosedAll Users
Actions

Authored by unterstein on Oct 5 2016, 11:19 AM.

Details

Reviewers
aquamatthias
meichstedt
Commits
rMARATHON954b1fde1f0e: Enhanced MarathonSchedulerActorTest https://github.
rMARATHONfe73fe7c495e: Enhanced MarathonSchedulerActorTest (#4567)
Summary

Enhanced MarathonSchedulerActorTest to be more verbose and explicitly to handle terminal task status

Test Plan

sbt test

Diff Detail

Repository
rMARATHON marathon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
unterstein retitled this revision from to Enhanced MarathonSchedulerActorTest https://github.com/mesosphere/marathon/issues/4534.Oct 5 2016, 11:19 AM
unterstein updated this object.
unterstein edited the test plan for this revision. (Show Details)
unterstein added a reviewer: meichstedt.
unterstein added a subscriber: marathon-team.
aquamatthias accepted this revision.Oct 5 2016, 2:30 PM
This revision is now accepted and ready to land.Oct 5 2016, 2:30 PM
unterstein updated this revision to Diff 80.Oct 5 2016, 4:15 PM

Updating D36: Enhanced MarathonSchedulerActorTest https://github.com/mesosphere/marathon/issues/4534

changing remote branch

meichstedt requested changes to this revision.Oct 6 2016, 2:33 PM
meichstedt added inline comments.
src/test/scala/mesosphere/marathon/MarathonSchedulerActorTest.scala
226

Please verify that there are no more interactions on the driver

272

Please verify that

  • there will be a separate call to driver.reconcile with an empty list (implicit reconciliation)
  • there are no more interactions on the driver
This revision now requires changes to proceed.Oct 6 2016, 2:33 PM
unterstein updated this revision to Diff 100.Oct 6 2016, 9:42 PM

Added MatthiasE feedback

Closed by commit rMARATHONfe73fe7c495e: Enhanced MarathonSchedulerActorTest (#4567) (authored by unterstein, committed by meichstedt). · Explain WhyOct 12 2016, 3:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 134

View Options

src/test/scala/mesosphere/marathon/MarathonSchedulerActorTest.scala

Show All 24 Lines
2525import mesosphere.marathon.storage.repository.{ AppRepository, DeploymentRepository, FrameworkIdRepository, GroupRepository, TaskFailureRepository, _ }
2626import mesosphere.marathon.stream._
2727import mesosphere.marathon.test.{ MarathonActorSupport, MarathonSpec, Mockito }
2828import mesosphere.marathon.upgrade._
2929import org.apache.mesos.Protos.{ Status, TaskStatus }
3030import org.apache.mesos.SchedulerDriver
3131import org.scalatest.{ BeforeAndAfterAll, FunSuiteLike, GivenWhenThen, Matchers }
3232
33import scala.collection.JavaConverters._
34import scala.collection.immutable.Set
3335import scala.concurrent.duration._
3436import scala.concurrent.{ ExecutionContext, Future, Promise }
3537
3638class MarathonSchedulerActorTest extends MarathonActorSupport
3739 with FunSuiteLike
3840 with Mockito
3941 with GivenWhenThen
4042 with Matchers
Show All 12 Lines
5355 schedulerActor ! LocalLeadershipEvent.ElectedAsLeader
5456 awaitAssert(verify(hcManager).reconcileWith(app.id), 5.seconds, 10.millis)
5557 verify(deploymentRepo, times(1)).all()
5658 } finally {
5759 stopActor(schedulerActor)
5860 }
5961 }
6062
61 test("ReconcileTasks") {
63 test("Reconcile orphan instance of unknown app - instance should be killed") {
6264 val f = new Fixture
6365 import f._
64 val app = AppDefinition(id = "/test-app".toPath, instances = 1)
65 val instance = TestInstanceBuilder.newBuilder(app.id).addTaskRunning().getInstance()
66 val app = AppDefinition(id = "/deleted-app".toPath, instances = 1)
67 val orphanedInstance = TestInstanceBuilder.newBuilder(app.id).addTaskRunning().getInstance()
6668
67 appRepo.ids() returns Source.single(app.id)
68 instanceTracker.instancesBySpec()(any[ExecutionContext]) returns Future.successful(InstanceTracker.InstancesBySpec.of(InstanceTracker.SpecInstances.forInstances("nope".toPath, Iterable(instance))))
69 appRepo.get(app.id) returns Future.successful(Some(app))
69 appRepo.ids() returns Source.empty[PathId]
70 instanceTracker.instancesBySpec()(any[ExecutionContext]) returns Future.successful(InstanceTracker.InstancesBySpec.of(InstanceTracker.SpecInstances.forInstances(app.id, Iterable(orphanedInstance))))
71 appRepo.get(app.id) returns Future.successful(None)
7072
7173 val schedulerActor = createActor()
7274 try {
7375 schedulerActor ! LocalLeadershipEvent.ElectedAsLeader
7476 schedulerActor ! ReconcileTasks
7577
7678 expectMsg(5.seconds, TasksReconciled)
7779
7880 awaitAssert({
79 killService.killed should contain (instance.instanceId)
81 killService.killed should contain (orphanedInstance.instanceId)
8082 }, 5.seconds, 10.millis)
8183 } finally {
8284 stopActor(schedulerActor)
8385 }
8486 }
8587
8688 test("Terminal tasks should not be submitted in reconciliation") {
8789 val f = new Fixture
8890 import f._
8991 val app = AppDefinition(id = "/test-app".toPath, instances = 1)
9092 val instance = TestInstanceBuilder.newBuilder(app.id).addTaskUnreachable(containerName = Some("unreachable")).addTaskRunning().addTaskGone(containerName = Some("gone")).getInstance()
9193
9294 appRepo.ids() returns Source.single(app.id)
93 instanceTracker.instancesBySpec()(any[ExecutionContext]) returns Future.successful(InstanceTracker.InstancesBySpec.of(InstanceTracker.SpecInstances.forInstances("nope".toPath, Iterable(instance))))
95 instanceTracker.instancesBySpec()(any[ExecutionContext]) returns Future.successful(InstanceTracker.InstancesBySpec.of(InstanceTracker.SpecInstances.forInstances(app.id, Iterable(instance))))
9496 appRepo.get(app.id) returns Future.successful(Some(app))
9597
9698 val schedulerActor = createActor()
9799 try {
98100 schedulerActor ! LocalLeadershipEvent.ElectedAsLeader
99101 schedulerActor ! ReconcileTasks
100102
101103 expectMsg(5.seconds, TasksReconciled)
102104
103105 val expectedStatus: java.util.Collection[TaskStatus] =
104106 JavaSet(instance.tasks.withFilter(!_.task.isTerminal).flatMap(_.mesosStatus)(collection.breakOut))
105107 assert(expectedStatus.size() == 2, "Only non-terminal tasks should be expected to be reconciled")
106108 awaitAssert({
107109 driver.reconcileTasks(expectedStatus)
110 }, 5.seconds, 10.millis)
111 awaitAssert({
112 driver.reconcileTasks(java.util.Arrays.asList())
113 }, 5.seconds, 10.millis)
114 } finally {
115 stopActor(schedulerActor)
116 }
117 }
118
119 test("Terminal tasks should not be submitted in reconciliation - Instance with only terminal tasks") {
120 val f = new Fixture
121 import f._
122 val app = AppDefinition(id = "/test-app".toPath, instances = 1)
123 val instance = TestInstanceBuilder.newBuilder(app.id)
124 .addTaskError(containerName = Some("error"))
125 .addTaskFailed(containerName = Some("failed"))
126 .addTaskFinished(containerName = Some("finished"))
127 .addTaskKilled(containerName = Some("killed"))
128 .addTaskGone(containerName = Some("gone"))
129 .addTaskDropped(containerName = Some("dropped"))
130 .addTaskUnknown(containerName = Some("unknown"))
131 .getInstance()
132
133 appRepo.ids() returns Source.single(app.id)
134 instanceTracker.instancesBySpec()(any[ExecutionContext]) returns Future.successful(InstanceTracker.InstancesBySpec.of(InstanceTracker.SpecInstances.forInstances("nope".toPath, Iterable(instance))))
135 appRepo.get(app.id) returns Future.successful(Some(app))
136
137 val schedulerActor = createActor()
138 try {
139 schedulerActor ! LocalLeadershipEvent.ElectedAsLeader
140 schedulerActor ! ReconcileTasks
141
142 expectMsg(5.seconds, TasksReconciled)
143
144 verify(driver, once).reconcileTasks(java.util.Arrays.asList())
145 noMoreInteractions(driver)
146 } finally {
147 stopActor(schedulerActor)
148 }
149 }
150
151 test("Terminal tasks should not be submitted in reconciliation - Instance with all kind of tasks status") {
152 val f = new Fixture
153 import f._
154 val app = AppDefinition(id = "/test-app".toPath, instances = 1)
155 val instance = TestInstanceBuilder.newBuilder(app.id)
156 .addTaskError(containerName = Some("error"))
157 .addTaskFailed(containerName = Some("failed"))
158 .addTaskFinished(containerName = Some("finished"))
159 .addTaskKilled(containerName = Some("killed"))
160 .addTaskGone(containerName = Some("gone"))
161 .addTaskDropped(containerName = Some("dropped"))
162 .addTaskUnknown(containerName = Some("unknown"))
163 .addTaskReserved(containerName = Some("reserved"))
164 .addTaskCreated(containerName = Some("created"))
165 .addTaskKilling(containerName = Some("killing"))
166 .addTaskRunning(containerName = Some("running"))
167 .addTaskStaging(containerName = Some("staging"))
168 .addTaskStarting(containerName = Some("starting"))
169 .addTaskUnreachable(containerName = Some("unreachable"))
170 .getInstance()
171
172 appRepo.ids() returns Source.single(app.id)
173 instanceTracker.instancesBySpec()(any[ExecutionContext]) returns Future.successful(InstanceTracker.InstancesBySpec.of(InstanceTracker.SpecInstances.forInstances("nope".toPath, Iterable(instance))))
174 appRepo.get(app.id) returns Future.successful(Some(app))
175
176 val schedulerActor = createActor()
177 try {
178 schedulerActor ! LocalLeadershipEvent.ElectedAsLeader
179 schedulerActor ! ReconcileTasks
180
181 expectMsg(5.seconds, TasksReconciled)
182
183 val nonTerminalTasks = instance.tasks.filter(!_.task.isTerminal)
184 assert(nonTerminalTasks.size == 7, "We should have 7 non-terminal tasks")
185
186 val expectedStatus: java.util.Collection[TaskStatus] = nonTerminalTasks.flatMap(_.mesosStatus).toSet.asJava
187 assert(expectedStatus.size() == 6, "We should have 6 non-terminal task status, because Reserved do not have a mesosStatus")
188
189 awaitAssert({
190 driver.reconcileTasks(expectedStatus)
191 }, 5.seconds, 10.millis)
192 awaitAssert({
193 driver.reconcileTasks(java.util.Arrays.asList())
108194 }, 5.seconds, 10.millis)
109195 } finally {
110196 stopActor(schedulerActor)
111197 }
112198 }
113199
114200 test("ScaleApps") {
115201 val f = new Fixture
Show All 16 Lines
132218
133219 awaitAssert(verify(queue).add(app, 1), 5.seconds, 10.millis)
134220 } finally {
135221 stopActor(schedulerActor)
136222 }
137223 }
138224
139225 test("ScaleApp") {
140226 val f = new Fixture
meichstedtUnsubmitted
Not Done

Please verify that there are no more interactions on the driver

141227 import f._
142228 val app = AppDefinition(id = "test-app".toPath, instances = 1)
143229
144230 queue.get(app.id) returns Some(LaunchQueueTestHelper.zeroCounts)
145231 appRepo.ids() returns Source.single(app.id)
146232 instanceTracker.specInstancesSync(app.id) returns Iterable.empty[Instance]
147233
148234 appRepo.get(app.id) returns Future.successful(Some(app))
Show All 29 Lines
178264 f.killService.customStatusUpdates.put(instance.instanceId, Seq(instanceChangedEvent))
179265
180266 queue.get(app.id) returns Some(LaunchQueueTestHelper.zeroCounts)
181267 appRepo.ids() returns Source.single(app.id)
182268 instanceTracker.specInstancesLaunchedSync(app.id) returns Iterable(instance)
183269
184270 appRepo.get(app.id) returns (Future.successful(Some(app)), Future.successful(Some(app.copy(instances = 0))))
185271 instanceTracker.countLaunchedSpecInstancesSync(app.id) returns 0
186272 appRepo.store(any) returns Future.successful(Done)
meichstedtUnsubmitted
Not Done

Please verify that

  • there will be a separate call to driver.reconcile with an empty list (implicit reconciliation)
  • there are no more interactions on the driver
187273
188274 val schedulerActor = createActor()
189275 try {
190276 schedulerActor ! LocalLeadershipEvent.ElectedAsLeader
191277 schedulerActor ! KillTasks(app.id, Set(instance))
192278
193279 expectMsg(5.seconds, TasksKilled(app.id, Set(instance.instanceId)))
194280
▲ Show 20 Lines • Show All 401 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/core/instance/InstanceUpdateTest.scala

Show All 9 Lines
1010class InstanceUpdateTest extends UnitTest {
1111
1212 val f = new Fixture
1313 var instance: Instance = _
1414
1515 override protected def beforeEach(): Unit = {
1616 instance = {
1717 TestInstanceBuilder.newBuilder(PathId("/pod"))
18 .addTaskStaged(container = Some(f.container1))
19 .addTaskStaged(container = Some(f.container2))
18 .addTaskStaged(containerName = Some(f.container1.name))
19 .addTaskStaged(containerName = Some(f.container2.name))
2020 .getInstance()
2121 }
2222 }
2323
2424 "An instance with 2 containers" should {
2525 "have no health info if container1 is healthy and container2 is not Running" in {
2626 instance = TaskStatusUpdateTestHelper.runningHealthy(instance, Some(f.container1)).wrapped.instance
2727 instance.state.healthy shouldBe None
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/core/instance/TestInstanceBuilder.scala

Show All 11 Lines
1212
1313case class TestInstanceBuilder(
1414 instance: Instance, now: Timestamp = Timestamp.now()
1515) {
1616
1717 def addTaskLaunched(container: Option[MesosContainer] = None): TestInstanceBuilder =
1818 addTaskWithBuilder().taskLaunched(container).build()
1919
20 def addTaskReserved(reservation: Task.Reservation = TestTaskBuilder.Helper.newReservation): TestInstanceBuilder =
21 addTaskWithBuilder().taskReserved(reservation).build()
20 def addTaskReserved(reservation: Task.Reservation = TestTaskBuilder.Helper.newReservation, containerName: Option[String] = None): TestInstanceBuilder =
21 addTaskWithBuilder().taskReserved(reservation, containerName).build()
2222
2323 def addTaskResidentReserved(localVolumeIds: Task.LocalVolumeId*): TestInstanceBuilder =
2424 addTaskWithBuilder().taskResidentReserved(localVolumeIds: _*).build()
2525
2626 def addTaskResidentLaunched(localVolumeIds: Task.LocalVolumeId*): TestInstanceBuilder =
2727 addTaskWithBuilder().taskResidentLaunched(localVolumeIds: _*).build()
2828
29 def addTaskRunning(container: Option[MesosContainer] = None, stagedAt: Timestamp = now, startedAt: Timestamp = now): TestInstanceBuilder =
30 addTaskWithBuilder().taskRunning(container, stagedAt, startedAt).build()
29 def addTaskRunning(containerName: Option[String] = None, stagedAt: Timestamp = now, startedAt: Timestamp = now): TestInstanceBuilder =
30 addTaskWithBuilder().taskRunning(containerName, stagedAt, startedAt).build()
3131
3232 def addTaskUnreachable(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
3333 addTaskWithBuilder().taskUnreachable(since, containerName).build()
3434
35 def addTaskError(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
36 addTaskWithBuilder().taskError(since, containerName).build()
37
3538 def addTaskGone(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
3639 addTaskWithBuilder().taskGone(since, containerName).build()
3740
38 def addTaskStaged(stagedAt: Timestamp = now, version: Option[Timestamp] = None, container: Option[MesosContainer] = None): TestInstanceBuilder =
39 addTaskWithBuilder().taskStaged(container, stagedAt, version).build()
41 def addTaskUnknown(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
42 addTaskWithBuilder().taskUnknown(since, containerName).build()
4043
41 def addTaskStarting(stagedAt: Timestamp = now): TestInstanceBuilder =
42 addTaskWithBuilder().taskStarting(stagedAt).build()
44 def addTaskKilled(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
45 addTaskWithBuilder().taskKilled(since, containerName).build()
46
47 def addTaskDropped(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
48 addTaskWithBuilder().taskDropped(since, containerName).build()
49
50 def addTaskFinished(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
51 addTaskWithBuilder().taskFinished(since, containerName).build()
52
53 def addTaskFailed(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
54 addTaskWithBuilder().taskFailed(since, containerName).build()
55
56 def addTaskCreated(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
57 addTaskWithBuilder().taskCreated(since, containerName).build()
58
59 def addTaskKilling(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
60 addTaskWithBuilder().taskKilling(since, containerName).build()
61
62 def addTaskStaging(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
63 addTaskWithBuilder().taskStaging(since, containerName).build()
64
65 def addTaskStarting(since: Timestamp = now, containerName: Option[String] = None): TestInstanceBuilder =
66 addTaskWithBuilder().taskStarting(since, containerName).build()
67
68 def addTaskStaged(stagedAt: Timestamp = now, version: Option[Timestamp] = None, containerName: Option[String] = None): TestInstanceBuilder =
69 addTaskWithBuilder().taskStaged(containerName, stagedAt, version).build()
4370
4471 def addTaskWithBuilder(): TestTaskBuilder = TestTaskBuilder.newBuilder(this)
4572
4673 private[instance] def addTask(task: Task): TestInstanceBuilder = {
4774 val newBuilder = this.copy(instance = instance.updatedInstance(task, now + 1.second).copy(agentInfo = task.agentInfo))
4875 assert(newBuilder.getInstance().tasks.forall(_.agentInfo == task.agentInfo))
4976 newBuilder
5077 }
Show All 35 Lines
View Options

src/test/scala/mesosphere/marathon/core/instance/TestTaskBuilder.scala

Show All 27 Lines
2828
2929 def taskForStatus(mesosState: mesos.Protos.TaskState, stagedAt: Timestamp = now, container: Option[MesosContainer] = None) = {
3030 val instance = instanceBuilder.getInstance()
3131 val taskId = Task.Id.forInstanceId(instance.instanceId, container)
3232 val mesosStatus = TestTaskBuilder.Helper.statusForState(taskId.idString, mesosState)
3333 this.copy(task = Some(TestTaskBuilder.Helper.minimalTask(taskId, stagedAt, Some(mesosStatus))))
3434 }
3535
36 def maybeMesosContainerByName(name: Option[String]): Option[MesosContainer] = name.map(n => MesosContainer(name = n, resources = raml.Resources(cpus = 1.0f, mem = 128.0f)))
36 def maybeMesosContainerByName(name: Option[String]): Option[MesosContainer] = name.map(n => MesosContainer(name = n, resources = raml.Resources()))
3737
3838 def taskLaunched(container: Option[MesosContainer] = None) =
3939 this.copy(task = Some(TestTaskBuilder.Helper.minimalTask(instanceBuilder.getInstance().instanceId, container, now).copy(taskId = Task.Id.forInstanceId(instanceBuilder.getInstance().instanceId, None))))
4040
41 def taskReserved(reservation: Task.Reservation = TestTaskBuilder.Helper.newReservation) = {
41 def taskReserved(reservation: Task.Reservation = TestTaskBuilder.Helper.newReservation, containerName: Option[String] = None) = {
4242 val instance = instanceBuilder.getInstance()
43 this.copy(task = Some(TestTaskBuilder.Helper.minimalReservedTask(instance.instanceId.runSpecId, reservation, Some(instance)).copy(taskId = Task.Id.forInstanceId(instance.instanceId, None))))
43 this.copy(task = Some(TestTaskBuilder.Helper.minimalReservedTask(instance.instanceId.runSpecId, reservation, Some(instance)).copy(taskId = Task.Id.forInstanceId(instance.instanceId, maybeMesosContainerByName(containerName)))))
4444 }
4545
4646 def taskResidentReserved(localVolumeIds: Task.LocalVolumeId*) = {
4747 val instance = instanceBuilder.getInstance()
4848 this.copy(task = Some(TestTaskBuilder.Helper.residentReservedTask(instance.instanceId.runSpecId, TestTaskBuilder.Helper.taskReservationStateNew, localVolumeIds: _*).copy(taskId = Task.Id.forInstanceId(instance.instanceId, None))))
4949 }
5050
5151 def taskResidentReserved(taskReservationState: Task.Reservation.State) = {
5252 val instance = instanceBuilder.getInstance()
5353 this.copy(task = Some(TestTaskBuilder.Helper.residentReservedTask(instance.instanceId.runSpecId, taskReservationState, Seq.empty[Task.LocalVolumeId]: _*).copy(taskId = Task.Id.forInstanceId(instance.instanceId, None))))
5454 }
5555
5656 def taskResidentLaunched(localVolumeIds: Task.LocalVolumeId*) = {
5757 val instance = instanceBuilder.getInstance()
5858 this.copy(task = Some(TestTaskBuilder.Helper.residentLaunchedTask(instance.instanceId.runSpecId, localVolumeIds: _*).copy(taskId = Task.Id.forInstanceId(instance.instanceId, None))))
5959 }
6060
61 def taskRunning(container: Option[MesosContainer] = None, stagedAt: Timestamp = now, startedAt: Timestamp = now) = {
61 def taskRunning(containerName: Option[String] = None, stagedAt: Timestamp = now, startedAt: Timestamp = now) = {
6262 val instance = instanceBuilder.getInstance()
6363 this.copy(task = Some(TestTaskBuilder.Helper.runningTask(
64 Task.Id.forInstanceId(instance.instanceId, container),
64 Task.Id.forInstanceId(instance.instanceId, maybeMesosContainerByName(containerName)),
6565 instance.runSpecVersion, stagedAt = stagedAt.toDateTime.getMillis, startedAt = startedAt.toDateTime.getMillis).withAgentInfo(_ => instance.agentInfo)))
6666 }
6767
6868 def taskUnreachable(since: Timestamp = now, containerName: Option[String] = None) = {
6969 val instance = instanceBuilder.getInstance()
70 this.copy(task = Some(TestTaskBuilder.Helper.minimalUnreachableTask(instance.instanceId.runSpecId, since = since).copy(taskId = Task.Id.forInstanceId(instance.instanceId, maybeMesosContainerByName(containerName)))))
70 this.copy(task = Some(TestTaskBuilder.Helper.minimalUnreachableTask(instance.instanceId.runSpecId, since = since).copy(taskId = Task.Id.forInstanceId(instance.instanceId, maybeMesosContainerByName(containerName))).withAgentInfo(_ => instance.agentInfo)))
7171 }
7272
73 def taskGone(since: Timestamp = now, containerName: Option[String] = None) = {
73 def taskError(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Error)
74
75 def taskFailed(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Failed)
76
77 def taskFinished(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Finished)
78
79 def taskKilled(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Killed)
80
81 def taskDropped(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Dropped)
82
83 def taskUnknown(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Unknown)
84
85 def taskGone(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Gone)
86
87 def taskCreated(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Created)
88
89 def taskKilling(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Killing)
90
91 def taskStaging(since: Timestamp = now, containerName: Option[String] = None) = createTask(since, containerName, InstanceStatus.Staging)
92
93 def taskStaged(containerName: Option[String] = None, stagedAt: Timestamp = now, version: Option[Timestamp] = None) = {
7494 val instance = instanceBuilder.getInstance()
75 this.copy(task = Some(TestTaskBuilder.Helper.minimalLostTask(instance.instanceId.runSpecId, since = since, marathonTaskStatus = InstanceStatus.Gone).copy(taskId = Task.Id.forInstanceId(instance.instanceId, maybeMesosContainerByName(containerName)))))
95 this.copy(task = Some(TestTaskBuilder.Helper.stagedTask(Task.Id.forInstanceId(instance.instanceId, maybeMesosContainerByName(containerName)), version.getOrElse(instance.runSpecVersion), stagedAt = stagedAt.toDateTime.getMillis).withAgentInfo(_ => instance.agentInfo)))
7696 }
7797
78 def taskStaged(container: Option[MesosContainer] = None, stagedAt: Timestamp = now, version: Option[Timestamp] = None) = {
98 def taskStarting(stagedAt: Timestamp = now, containerName: Option[String] = None) = {
7999 val instance = instanceBuilder.getInstance()
80 this.copy(task = Some(TestTaskBuilder.Helper.stagedTask(Task.Id.forInstanceId(instance.instanceId, container), version.getOrElse(instance.runSpecVersion), stagedAt = stagedAt.toDateTime.getMillis).withAgentInfo(_ => instance.agentInfo)))
100 this.copy(task = Some(TestTaskBuilder.Helper.startingTaskForApp(instance.instanceId, stagedAt = stagedAt.toDateTime.getMillis, container = maybeMesosContainerByName(containerName)).withAgentInfo(_ => instance.agentInfo)))
81101 }
82102
83 def taskStarting(stagedAt: Timestamp = now) = {
103 private def createTask(since: Timestamp, containerName: Option[String], status: InstanceStatus) = {
84104 val instance = instanceBuilder.getInstance()
85 this.copy(task = Some(TestTaskBuilder.Helper.startingTaskForApp(instance.instanceId, stagedAt = stagedAt.toDateTime.getMillis)))
105 this.copy(task = Some(TestTaskBuilder.Helper.minimalTask(Task.Id.forInstanceId(instance.instanceId, maybeMesosContainerByName(containerName)), since, None, status).withAgentInfo(_ => instance.agentInfo)))
86106 }
87107
88108 def withAgentInfo(update: Instance.AgentInfo => Instance.AgentInfo): TestTaskBuilder = this.copy(task = task.map(_.withAgentInfo(update)))
89109
90110 def withHostPorts(update: Seq[Int]): TestTaskBuilder = this.copy(task = task.map(_.withHostPorts(update)))
91111
92112 def withNetworkInfos(update: scala.collection.Seq[NetworkInfo]): TestTaskBuilder = this.copy(task = task.map(_.withNetworkInfos(update)))
93113
▲ Show 20 Lines • Show All 125 Lines • ▼ Show 20 Line(s)
219239 startedAt = None,
220240 mesosStatus = None,
221241 taskStatus = InstanceStatus.Running
222242 ),
223243 hostPorts = Seq.empty,
224244 reservation = Task.Reservation(localVolumeIds, Task.Reservation.State.Launched))
225245 }
226246
227 def startingTaskForApp(instanceId: Instance.Id, appVersion: Timestamp = Timestamp(1), stagedAt: Long = 2): Task.LaunchedEphemeral =
247 def startingTaskForApp(instanceId: Instance.Id, appVersion: Timestamp = Timestamp(1), stagedAt: Long = 2, container: Option[MesosContainer] = None): Task.LaunchedEphemeral =
228248 startingTask(
229 Task.Id.forInstanceId(instanceId, None),
249 Task.Id.forInstanceId(instanceId, container),
230250 appVersion = appVersion,
231251 stagedAt = stagedAt
232252 )
233253
234254 def startingTask(taskId: Task.Id, appVersion: Timestamp = Timestamp(1), stagedAt: Long = 2): Task.LaunchedEphemeral =
235255 Task.LaunchedEphemeral(
236256 taskId = taskId,
237257 agentInfo = Instance.AgentInfo("some.host", Some("agent-1"), Seq.empty),
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/core/task/termination/impl/KillServiceActorTest.scala

Show First 20 Lines • Show All 273 Lines • ▼ Show 20 Line(s)
274274 val f = new Fixture
275275 val actor = f.createTaskKillActor(f.defaultConfig)
276276
277277 Given("a pod instance with 3 tasks (1 staging, 1 running, 1 Finished)")
278278 val stagingContainer = f.container("stagingContainer")
279279 val runningContainer = f.container("runningContainer")
280280 val finishedContainer = f.container("finishedContainer")
281281 var instance = TestInstanceBuilder.newBuilder(f.runSpecId)
282 .addTaskStaged(container = Some(stagingContainer))
283 .addTaskStaged(container = Some(runningContainer))
284 .addTaskStaged(container = Some(finishedContainer))
282 .addTaskStaged(containerName = Some(stagingContainer.name))
283 .addTaskStaged(containerName = Some(runningContainer.name))
284 .addTaskStaged(containerName = Some(finishedContainer.name))
285285 .getInstance()
286286 instance = TaskStatusUpdateTestHelper.running(instance, Some(runningContainer)).updatedInstance
287287 instance = TaskStatusUpdateTestHelper.finished(instance, Some(finishedContainer)).updatedInstance
288288
289289 When("the service is asked to kill that task")
290290 val promise = Promise[Done]()
291291 actor ! KillServiceActor.KillInstances(Seq(instance), promise)
292292
Show All 17 Lines
310310 test("A pod instance with only terminal tasks will be expunged and no kills issued") {
311311 val f = new Fixture
312312 val actor = f.createTaskKillActor(f.defaultConfig)
313313
314314 Given("a pod instance with 2 finished tasks")
315315 val finishedContainer1 = f.container("finishedContainer1")
316316 val finishedContainer2 = f.container("finishedContainer2")
317317 var instance = TestInstanceBuilder.newBuilder(f.runSpecId)
318 .addTaskRunning(container = Some(finishedContainer1))
319 .addTaskRunning(container = Some(finishedContainer2))
318 .addTaskRunning(containerName = Some(finishedContainer1.name))
319 .addTaskRunning(containerName = Some(finishedContainer2.name))
320320 .getInstance()
321321 instance = TaskStatusUpdateTestHelper.finished(instance, Some(finishedContainer1)).updatedInstance
322322 instance = TaskStatusUpdateTestHelper.finished(instance, Some(finishedContainer2)).updatedInstance
323323
324324 When("the service is asked to kill that instance")
325325 val promise = Promise[Done]()
326326 actor ! KillServiceActor.KillInstances(Seq(instance), promise)
327327
▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines