HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D308

Removed unreachableInstances from QueuedInstanceInfo and QueuedInstanceInfoWithStatistics
ClosedAll Users
Actions

Authored by meichstedt on Dec 9 2016, 3:41 PM.

Details

Reviewers
aquamatthias
unterstein
jeschkies
Commits
rMARATHON114ea54d4774: Removed unreachableInstances from QueuedInstanceInfo and…
rMARATHONc9b67e151347: Removed unreachableInstances from QueuedInstanceInfo and…
rMARATHON5207bc168bcf: Removed unreachableInstances from QueuedInstanceInfo and…
Summary

In both cases, the property was only used in tests and did not add value in the given conext

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.
Changes from before your most recent comment are hidden. Show Older Changes
jeschkies accepted this revision.Dec 9 2016, 5:00 PM

So we've never really used that parameter? 😱

This revision is now accepted and ready to land.Dec 9 2016, 5:00 PM
aquamatthias accepted this revision.Dec 12 2016, 10:22 AM
Closed by commit rMARATHON114ea54d4774: Removed unreachableInstances from QueuedInstanceInfo and… (authored by meichstedt). · Explain WhyDec 12 2016, 11:50 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1219

View Options

src/main/scala/mesosphere/marathon/core/launchqueue/LaunchQueue.scala

Show All 10 Lines
1111
1212object LaunchQueue {
1313
1414 /**
1515 * @param runSpec the associated runSpec
1616 * @param inProgress true if the launch queue currently tries to launch more instances
1717 * @param instancesLeftToLaunch number of instances to launch
1818 * @param finalInstanceCount the final number of instances currently targeted
19 * @param unreachableInstances number of instances currently unreachable
2019 * @param backOffUntil timestamp until which no further launch attempts will be made
2120 */
2221 case class QueuedInstanceInfo(
2322 runSpec: RunSpec,
2423 inProgress: Boolean,
2524 instancesLeftToLaunch: Int,
2625 finalInstanceCount: Int,
27 unreachableInstances: Int,
2826 backOffUntil: Timestamp,
2927 startedAt: Timestamp)
3028
3129 case class QueuedInstanceInfoWithStatistics(
3230 runSpec: RunSpec,
3331 inProgress: Boolean,
3432 instancesLeftToLaunch: Int,
3533 finalInstanceCount: Int,
36 unreachableInstances: Int,
3734 backOffUntil: Timestamp,
3835 startedAt: Timestamp,
3936 rejectSummaryLastOffers: Map[NoOfferMatchReason, Int],
4037 rejectSummaryLaunchAttempt: Map[NoOfferMatchReason, Int],
4138 processedOffersCount: Int,
4239 unusedOffersCount: Int,
4340 lastMatch: Option[OfferMatchResult.Match],
4441 lastNoMatch: Option[OfferMatchResult.NoMatch],
Show All 39 Lines
View Options

src/main/scala/mesosphere/marathon/core/launchqueue/impl/OfferMatchStatisticsActor.scala

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s)
4949 val runSpecId = queueInfo.runSpec.id
5050 val statistics = runSpecStatistics(runSpecId)
5151 val lastOffers = lastNoMatches.get(runSpecId).fold(emptyNoMatches)(_.values.toVector)
5252 QueuedInstanceInfoWithStatistics(
5353 queueInfo.runSpec,
5454 queueInfo.inProgress,
5555 queueInfo.instancesLeftToLaunch,
5656 queueInfo.finalInstanceCount,
57 queueInfo.unreachableInstances,
5857 queueInfo.backOffUntil,
5958 queueInfo.startedAt,
6059 lastOfferSummary(lastOffers),
6160 statistics.rejectSummary,
6261 statistics.processedOfferCount,
6362 statistics.unusedOfferCount,
6463 statistics.lastMatch,
6564 statistics.lastNoMatch,
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines
View Options

src/main/scala/mesosphere/marathon/core/launchqueue/impl/TaskLauncherActor.scala

Show First 20 Lines • Show All 340 Lines • ▼ Show 20 Line(s)
341341 val instancesLaunched = instanceMap.values.count(_.isLaunched)
342342 val instancesLaunchesInFlight = inFlightInstanceOperations.keys
343343 .count(instanceId => instanceMap.get(instanceId).exists(_.isLaunched))
344344 sender() ! QueuedInstanceInfo(
345345 runSpec,
346346 inProgress = instancesToLaunch > 0 || inFlightInstanceOperations.nonEmpty,
347347 instancesLeftToLaunch = instancesToLaunch,
348348 finalInstanceCount = instancesToLaunch + instancesLaunchesInFlight + instancesLaunched,
349 unreachableInstances = instanceMap.values.count(instance => instance.isUnreachable || instance.isUnreachableInactive),
350349 backOffUntil.getOrElse(clock.now()),
351350 startedAt
352351 )
353352 }
354353
355354 private[this] def receiveProcessOffers: Receive = {
356355 case ActorOfferMatcher.MatchOffer(deadline, offer) if clock.now() >= deadline || !shouldLaunchInstances =>
357356 val deadlineReached = clock.now() >= deadline
▲ Show 20 Lines • Show All 132 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/api/v2/QueueResourceTest.scala

Show All 20 Lines
2121class QueueResourceTest extends MarathonSpec with Matchers with Mockito with GivenWhenThen {
2222
2323 test("return well formatted JSON") {
2424 //given
2525 val app = AppDefinition(id = "app".toRootPath, acceptedResourceRoles = Set("*"))
2626 val noMatch = OfferMatchResult.NoMatch(app, MarathonTestHelper.makeBasicOffer().build(), Seq(NoOfferMatchReason.InsufficientCpus), clock.now())
2727 queue.listWithStatistics returns Seq(
2828 QueuedInstanceInfoWithStatistics(
29 app, inProgress = true, instancesLeftToLaunch = 23, finalInstanceCount = 23, unreachableInstances = 0,
29 app, inProgress = true, instancesLeftToLaunch = 23, finalInstanceCount = 23,
3030 backOffUntil = clock.now() + 100.seconds, startedAt = clock.now(),
3131 rejectSummaryLastOffers = Map(NoOfferMatchReason.InsufficientCpus -> 1),
3232 rejectSummaryLaunchAttempt = Map(NoOfferMatchReason.InsufficientCpus -> 3), processedOffersCount = 3, unusedOffersCount = 1,
3333 lastMatch = None, lastNoMatch = None, lastNoMatches = Seq(noMatch)
3434 )
3535 )
3636
3737 //when
Show All 22 Lines
6060 (resource \ "ranges") shouldBe a[JsUndefined]
6161 }
6262
6363 test("the generated info from the queue contains 0 if there is no delay") {
6464 //given
6565 val app = AppDefinition(id = "app".toRootPath)
6666 queue.listWithStatistics returns Seq(
6767 QueuedInstanceInfoWithStatistics(
68 app, inProgress = true, instancesLeftToLaunch = 23, finalInstanceCount = 23, unreachableInstances = 0,
68 app, inProgress = true, instancesLeftToLaunch = 23, finalInstanceCount = 23,
6969 backOffUntil = clock.now() - 100.seconds, startedAt = clock.now(), rejectSummaryLastOffers = Map.empty,
7070 rejectSummaryLaunchAttempt = Map.empty, processedOffersCount = 3, unusedOffersCount = 1, lastMatch = None,
7171 lastNoMatch = None, lastNoMatches = Seq.empty
7272 )
7373 )
7474 //when
7575 val response = queueResource.index(auth.request, new java.util.HashSet())
7676
Show All 20 Lines
9797 response.getStatus should be(404)
9898 }
9999
100100 test("application backoff can be removed from the launch queue") {
101101 //given
102102 val app = AppDefinition(id = "app".toRootPath)
103103 queue.list returns Seq(
104104 QueuedInstanceInfo(
105 app, inProgress = true, instancesLeftToLaunch = 23, finalInstanceCount = 23, unreachableInstances = 0,
105 app, inProgress = true, instancesLeftToLaunch = 23, finalInstanceCount = 23,
106106 backOffUntil = clock.now() + 100.seconds, startedAt = clock.now()
107107 )
108108 )
109109
110110 //when
111111 val response = queueResource.resetDelay("app", auth.request)
112112
113113 //then
Show All 20 Lines
134134 test("access without authorization is denied if the app is in the queue") {
135135 Given("An unauthorized request")
136136 auth.authenticated = true
137137 auth.authorized = false
138138 val req = auth.request
139139
140140 When("one delay is reset")
141141 val appId = "appId".toRootPath
142 val taskCount = LaunchQueue.QueuedInstanceInfo(AppDefinition(appId), inProgress = false, 0, 0, unreachableInstances = 0,
142 val taskCount = LaunchQueue.QueuedInstanceInfo(AppDefinition(appId), inProgress = false, 0, 0,
143143 backOffUntil = clock.now() + 100.seconds, startedAt = clock.now())
144144 queue.list returns Seq(taskCount)
145145
146146 val resetDelay = queueResource.resetDelay("appId", req)
147147 Then("we receive a not authorized response")
148148 resetDelay.getStatus should be(auth.UnauthorizedStatus)
149149 }
150150
Show All 34 Lines
View Options

src/test/scala/mesosphere/marathon/core/launcher/impl/LaunchQueueTestHelper.scala

11package mesosphere.marathon.core.launcher.impl
22
33import mesosphere.marathon.core.launchqueue.LaunchQueue
44import mesosphere.marathon.state.{ PathId, Timestamp, AppDefinition }
55
66object LaunchQueueTestHelper {
77 val zeroCounts = LaunchQueue.QueuedInstanceInfo(
88 runSpec = AppDefinition(PathId("/thisisignored")),
99 inProgress = true,
1010 instancesLeftToLaunch = 0,
1111 finalInstanceCount = 0,
12 unreachableInstances = 0,
1312 backOffUntil = Timestamp(0),
1413 startedAt = Timestamp(0)
1514 )
1615
1716 def instanceCounts(instancesLeftToLaunch: Int, finalInstanceCount: Int): LaunchQueue.QueuedInstanceInfo = {
1817 LaunchQueue.QueuedInstanceInfo(
1918 runSpec = AppDefinition(PathId("/thisisignored")),
2019 inProgress = true,
2120 instancesLeftToLaunch = instancesLeftToLaunch,
2221 finalInstanceCount = finalInstanceCount,
23 unreachableInstances = 0,
2422 backOffUntil = Timestamp(0),
2523 startedAt = Timestamp(0)
2624 )
2725 }
2826}
View Options

src/test/scala/mesosphere/marathon/core/launchqueue/impl/OfferMatchStatisticsActorTest.scala

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Line(s)
8585 actor ! f.matchedC
8686 eventually { actor.underlyingActor.runSpecStatistics should have size 2 }
8787 eventually { actor.underlyingActor.lastNoMatches should have size 1 }
8888 actor.underlyingActor.runSpecStatistics.get(f.runSpecA.id) should be(defined)
8989 actor.underlyingActor.runSpecStatistics.get(f.runSpecC.id) should be(defined)
9090
9191 When("The launch attempt for app A finishes")
9292 actor ! SendStatistics(self, Seq(
93 QueuedInstanceInfo(f.runSpecA, inProgress = true, 1, 1, 1, Timestamp.now(), Timestamp.now()),
94 QueuedInstanceInfo(f.runSpecC, inProgress = true, 1, 1, 1, Timestamp.now(), Timestamp.now())
93 QueuedInstanceInfo(f.runSpecA, inProgress = true, 1, 1, Timestamp.now(), Timestamp.now()),
94 QueuedInstanceInfo(f.runSpecC, inProgress = true, 1, 1, Timestamp.now(), Timestamp.now())
9595 ))
9696
9797 Then("The statistics for app A are removed")
9898 val infos = expectMsgAnyClassOf(classOf[Seq[QueuedInstanceInfoWithStatistics]])
9999 infos should have size 2
100100 val infoA = infos.find(_.runSpec == f.runSpecA).get
101101 infoA.lastMatch should be(Some(f.matchedA))
102102 infoA.lastNoMatch should be(Some(f.noMatchA))
Show All 23 Lines
View Options

src/test/scala/mesosphere/marathon/core/launchqueue/impl/TaskLauncherActorTest.scala

Show First 20 Lines • Show All 286 Lines • ▼ Show 20 Line(s)
287287
288288 Mockito.verify(instanceTracker).instancesBySpecSync
289289 val matchRequest = InstanceOpFactory.Request(f.app, offer, Seq.empty, additionalLaunches = 1)
290290 Mockito.verify(instanceOpFactory).matchOfferRequest(matchRequest)
291291 }
292292
293293 test("Expunged task is removed from counts") {
294294 val update = TaskStatusUpdateTestHelper.finished(f.marathonInstance).wrapped
295 val expectedCounts = QueuedInstanceInfo(f.app, inProgress = false, 0, 0, 0, Timestamp(0), Timestamp(0))
295 val expectedCounts = QueuedInstanceInfo(f.app, inProgress = false, 0, 0, Timestamp(0), Timestamp(0))
296296
297297 Mockito.when(instanceTracker.instancesBySpecSync).thenReturn(InstanceTracker.InstancesBySpec.forInstances(f.marathonInstance))
298298
299299 val launcherRef = createLauncherRef(instances = 0)
300300 launcherRef ! RateLimiterActor.DelayUpdate(f.app, clock.now())
301301
302302 // wait for startup
303303 Await.result(launcherRef ? TaskLauncherActor.GetCount, 3.seconds).asInstanceOf[QueuedInstanceInfo]
Show All 20 Lines
324324 val launcherRef = createLauncherRef(instances = 0)
325325 launcherRef ! RateLimiterActor.DelayUpdate(f.app, clock.now())
326326
327327 // wait for startup
328328 Await.result(launcherRef ? TaskLauncherActor.GetCount, 3.seconds).asInstanceOf[QueuedInstanceInfo]
329329
330330 // task status update
331331 val counts = Await.result(launcherRef ? update.wrapped, 3.seconds).asInstanceOf[QueuedInstanceInfo]
332
333 assert(counts.unreachableInstances == 0)
334
335332 assert(!counts.inProgress)
336333 assert(counts.instancesLeftToLaunch == 0)
337334
338335 Mockito.verify(instanceTracker, Mockito.timeout(8000)).instancesBySpecSync
339336 }
340337 }
341338
342339 for (
343340 reason <- TaskConditionMapping.Unreachable
344341 ) {
345342 test(s"TemporarilyUnreachable task ($reason) is NOT removed") {
346343 val update = TaskStatusUpdateTestHelper.lost(reason, f.marathonInstance, timestamp = clock.now())
347344 Mockito.when(instanceTracker.instancesBySpecSync).thenReturn(InstanceTracker.InstancesBySpec.forInstances(f.marathonInstance))
348345
349346 val launcherRef = createLauncherRef(instances = 0)
350347 launcherRef ! RateLimiterActor.DelayUpdate(f.app, clock.now())
351348
352349 // wait for startup
353350 Await.result(launcherRef ? TaskLauncherActor.GetCount, 3.seconds).asInstanceOf[QueuedInstanceInfo]
354351
355352 // task status update
356353 val counts = Await.result(launcherRef ? update.wrapped, 3.seconds).asInstanceOf[QueuedInstanceInfo]
357354 assert(!counts.inProgress)
358355 assert(counts.finalInstanceCount == 1)
359 assert(counts.unreachableInstances == 1)
360356 assert(counts.instancesLeftToLaunch == 0)
361357
362358 Mockito.verify(instanceTracker).instancesBySpecSync
363359 }
364360 }
365361
366362 test("Updated task is reflected in counts") {
367363 val update = TaskStatusUpdateTestHelper.runningHealthy(f.marathonInstance)
368 val expectedCounts = QueuedInstanceInfo(f.app, inProgress = false, 0, 1, 0, Timestamp(0), Timestamp(0))
364 val expectedCounts = QueuedInstanceInfo(f.app, inProgress = false, 0, 1, Timestamp(0), Timestamp(0))
369365
370366 Mockito.when(instanceTracker.instancesBySpecSync).thenReturn(InstanceTracker.InstancesBySpec.forInstances(f.marathonInstance))
371367
372368 val launcherRef = createLauncherRef(instances = 0)
373369 launcherRef ! RateLimiterActor.DelayUpdate(f.app, clock.now())
374370
375371 // wait for startup
376372 Await.result(launcherRef ? TaskLauncherActor.GetCount, 3.seconds).asInstanceOf[QueuedInstanceInfo]
▲ Show 20 Lines • Show All 134 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/raml/QueueInfoConversionTest.scala

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Line(s)
7070 DeclinedOfferStep("InsufficientDisk", 0, 0),
7171 DeclinedOfferStep("InsufficientGpus", 0, 0),
7272 DeclinedOfferStep("InsufficientPorts", 0, 0)
7373 )
7474
7575 val info = QueuedInstanceInfoWithStatistics(app, inProgress = true,
7676 instancesLeftToLaunch = 23,
7777 finalInstanceCount = 23,
78 unreachableInstances = 12,
7978 backOffUntil = now,
8079 startedAt = now,
8180 rejectSummaryLastOffers = lastSummary,
8281 rejectSummaryLaunchAttempt = summary,
8382 processedOffersCount = 123,
8483 unusedOffersCount = 100,
8584 lastMatch = None,
8685 lastNoMatch = Some(noMatch.head),
Show All 21 Lines