aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject git commit: AURORA-136: SchedulerLifecycle ACTIVE state is unused
Date Fri, 31 Jan 2014 07:36:25 GMT
Updated Branches:
  refs/heads/master f6ef17949 -> a6f78b2e0


AURORA-136: SchedulerLifecycle ACTIVE state is unused

Removes the unused REGISTERED_LEADER state and replaces it with the
ACTIVE status.

Bugs closed: AURORA-136

Reviewed at https://reviews.apache.org/r/17579/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/a6f78b2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/a6f78b2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/a6f78b2e

Branch: refs/heads/master
Commit: a6f78b2e02266c9a2c454dced8f8611720f9835e
Parents: f6ef179
Author: Dan Norris <protochron@gmail.com>
Authored: Thu Jan 30 23:16:52 2014 -0800
Committer: Bill Farner <wfarner@apache.org>
Committed: Thu Jan 30 23:16:52 2014 -0800

----------------------------------------------------------------------
 .../java/org/apache/aurora/scheduler/SchedulerLifecycle.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a6f78b2e/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java b/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
index 8304727..8f3f75b 100644
--- a/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
+++ b/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
@@ -96,7 +96,6 @@ public class SchedulerLifecycle implements EventSubscriber {
     PREPARING_STORAGE,
     STORAGE_PREPARED,
     LEADER_AWAITING_REGISTRATION,
-    REGISTERED_LEADER,
     ACTIVE,
     DEAD
   }
@@ -376,9 +375,6 @@ public class SchedulerLifecycle implements EventSubscriber {
         .addState(
             dieOnError(Closures.filter(NOT_DEAD, handleRegistered)),
             State.LEADER_AWAITING_REGISTRATION,
-            State.REGISTERED_LEADER, State.DEAD)
-        .addState(
-            State.REGISTERED_LEADER,
             State.ACTIVE, State.DEAD)
         .addState(
             State.ACTIVE,
@@ -422,7 +418,7 @@ public class SchedulerLifecycle implements EventSubscriber {
 
   @Subscribe
   public void registered(DriverRegistered event) {
-    stateMachine.transition(State.REGISTERED_LEADER);
+    stateMachine.transition(State.ACTIVE);
   }
 
   private static class SchedulerCandidateImpl implements LeadershipListener {


Mime
View raw message