HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D315

Moved InstanceUpdateOpResolver to correct package
ClosedAll Users
Actions

Authored by meichstedt on Dec 12 2016, 2:26 PM.

Details

Reviewers
aquamatthias
unterstein
Commits
rMARATHON564679b78a4a: Moved InstanceUpdateOpResolver to correct package
rMARATHONbf74d2740cbe: Moved InstanceUpdateOpResolver to correct package
rMARATHON929d3421d5ca: Moved InstanceUpdateOpResolver to correct package
Summary

InstanceUpdateOpResolver still resided in core.task although it's related to instances. Moved so that subsequent diffs keep the move/modify history.

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.
meichstedt retitled this revision from to Moved InstanceUpdateOpResolver to correct package.Dec 12 2016, 2:26 PM
meichstedt updated this object.
meichstedt edited the test plan for this revision. (Show Details)
meichstedt added reviewers: unterstein, aquamatthias.
meichstedt added a subscriber: marathon-team.
This revision is now accepted and ready to land.Dec 12 2016, 2:29 PM
aquamatthias accepted this revision.Dec 12 2016, 2:30 PM
Closed by commit rMARATHONbf74d2740cbe: Moved InstanceUpdateOpResolver to correct package (authored by meichstedt). · Explain WhyDec 12 2016, 3:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1227

View Options

src/main/scala/mesosphere/marathon/core/instance/update/InstanceUpdateOpResolver.scala

  • This file was moved from src/main/scala/mesosphere/marathon/core/task/tracker/impl/InstanceUpdateOpResolver.scala.
11package mesosphere.marathon
2package core.task.tracker.impl
2package core.instance.update
33
44import mesosphere.marathon.core.base.Clock
55import mesosphere.marathon.core.condition.Condition
66import mesosphere.marathon.core.instance.Instance
7import mesosphere.marathon.core.instance.update.{ InstanceChangedEventsGenerator, InstanceUpdateEffect, InstanceUpdateOperation }
87import mesosphere.marathon.core.task.tracker.InstanceTracker
98import org.slf4j.LoggerFactory
109
1110import scala.concurrent.{ ExecutionContext, Future }
1211
1312/**
1413 * Maps a [[InstanceUpdateOperation]] to the appropriate [[InstanceUpdateEffect]].
1514 *
1615 * @param directInstanceTracker a TaskTracker instance that goes directly to the correct taskTracker
1716 * without going through the WhenLeaderActor indirection.
1817 */
19private[tracker] class InstanceUpdateOpResolver(directInstanceTracker: InstanceTracker, clock: Clock) {
18private[marathon] class InstanceUpdateOpResolver(directInstanceTracker: InstanceTracker, clock: Clock) {
2019 private[this] val log = LoggerFactory.getLogger(getClass)
2120 private[this] val eventsGenerator = InstanceChangedEventsGenerator
2221
2322 /**
2423 * Maps the TaskStateOp
2524 *
2625 * * a TaskStateChange.Failure if the task does not exist OR ELSE
2726 * * delegates the TaskStateOp to the existing task that will then determine the state change
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines
View Options

src/main/scala/mesosphere/marathon/core/task/tracker/InstanceTrackerModule.scala

11package mesosphere.marathon.core.task.tracker
22
33import akka.actor.ActorRef
44import akka.stream.Materializer
55import mesosphere.marathon.core.base.Clock
6import mesosphere.marathon.core.instance.update.InstanceChangeHandler
6import mesosphere.marathon.core.instance.update.{ InstanceChangeHandler, InstanceUpdateOpResolver }
77import mesosphere.marathon.core.leadership.LeadershipModule
88import mesosphere.marathon.core.task.tracker.impl._
99import mesosphere.marathon.metrics.Metrics
1010import mesosphere.marathon.storage.repository.InstanceRepository
1111
1212/**
1313 * Provides the interfaces to query the current task state ([[InstanceTracker]]) and to
1414 * update the task state ([[TaskStateOpProcessor]]).
Show All 36 Lines
View Options

src/main/scala/mesosphere/marathon/core/task/tracker/impl/InstanceOpProcessorImpl.scala

11package mesosphere.marathon.core.task.tracker.impl
22
33import akka.actor.{ ActorRef, Status }
44import akka.util.Timeout
55import mesosphere.marathon.core.event.MarathonEvent
66import mesosphere.marathon.core.instance.Instance
7import mesosphere.marathon.core.instance.update.InstanceUpdateEffect
7import mesosphere.marathon.core.instance.update.{ InstanceUpdateEffect, InstanceUpdateOpResolver }
88import mesosphere.marathon.core.task.tracker.InstanceTrackerConfig
99import mesosphere.marathon.storage.repository.InstanceRepository
1010import org.slf4j.LoggerFactory
1111
1212import scala.concurrent.{ ExecutionContext, Future }
1313import scala.collection.immutable.Seq
1414import scala.util.control.NonFatal
1515
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines
View Options

src/main/scala/mesosphere/marathon/core/task/tracker/impl/InstanceUpdateOpResolver.scala

  • This file was moved to src/main/scala/mesosphere/marathon/core/instance/update/InstanceUpdateOpResolver.scala.
View Options

src/test/scala/mesosphere/marathon/core/instance/update/InstanceUpdateOpResolverTest.scala

  • This file was moved from src/test/scala/mesosphere/marathon/core/task/tracker/impl/InstanceUpdateOpResolverTest.scala.
1package mesosphere.marathon.core.task.tracker.impl
1package mesosphere.marathon
2package core.instance.update
23
34import mesosphere.marathon.core.base.ConstantClock
45import mesosphere.marathon.core.condition.Condition
5import mesosphere.marathon.core.instance.update.{ InstanceChangedEventsGenerator, InstanceUpdateEffect, InstanceUpdateOperation }
66import mesosphere.marathon.core.instance.{ Instance, TestInstanceBuilder }
77import mesosphere.marathon.core.task.bus.{ MesosTaskStatusTestHelper, TaskStatusUpdateTestHelper }
88import mesosphere.marathon.core.task.state.{ NetworkInfo, TaskConditionMapping }
99import mesosphere.marathon.core.task.tracker.InstanceTracker
1010import mesosphere.marathon.core.task.{ Task, TaskCondition }
1111import mesosphere.marathon.state.{ PathId, Timestamp }
1212import mesosphere.marathon.test.Mockito
1313import org.apache.mesos
▲ Show 20 Lines • Show All 515 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/core/task/tracker/impl/InstanceOpProcessorImplTest.scala

11package mesosphere.marathon.core.task.tracker.impl
22
33import akka.Done
44import akka.actor.{ ActorRef, Status }
55import akka.event.EventStream
66import akka.testkit.TestProbe
77import ch.qos.logback.classic.Level
88import com.codahale.metrics.MetricRegistry
99import com.google.inject.Provider
1010import mesosphere.marathon.core.instance.TestInstanceBuilder
1111import mesosphere.marathon.core.CoreGuiceModule
1212import mesosphere.marathon.core.base.ConstantClock
1313import mesosphere.marathon.core.health.HealthCheckManager
1414import mesosphere.marathon.core.instance.Instance
15import mesosphere.marathon.core.instance.update.{ InstanceUpdateEffect, InstanceUpdateOperation }
15import mesosphere.marathon.core.instance.update.{ InstanceUpdateEffect, InstanceUpdateOpResolver, InstanceUpdateOperation }
1616import mesosphere.marathon.core.launchqueue.LaunchQueue
1717import mesosphere.marathon.core.task.bus.{ MesosTaskStatusTestHelper, TaskStatusEmitter }
1818import mesosphere.marathon.core.task.update.impl.steps.{ NotifyHealthCheckManagerStepImpl, NotifyLaunchQueueStepImpl, NotifyRateLimiterStepImpl, PostToEventStreamStepImpl, ScaleAppUpdateStepImpl, TaskStatusEmitterPublishStepImpl }
1919import mesosphere.marathon.metrics.Metrics
2020import mesosphere.marathon.state.{ PathId, Timestamp }
2121import mesosphere.marathon.storage.repository.{ AppRepository, InstanceRepository, ReadOnlyAppRepository }
2222import mesosphere.marathon.test.{ CaptureLogEvents, MarathonActorSupport, Mockito, _ }
2323import org.apache.mesos.SchedulerDriver
▲ Show 20 Lines • Show All 422 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/marathon/core/task/tracker/impl/InstanceUpdateOpResolverTest.scala

  • This file was moved to src/test/scala/mesosphere/marathon/core/instance/update/InstanceUpdateOpResolverTest.scala.