You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2015/05/13 00:10:00 UTC
aurora git commit: Removing dead code from StateManagerImpl.
Repository: aurora
Updated Branches:
refs/heads/master 759ef6827 -> c1b0dce41
Removing dead code from StateManagerImpl.
Reviewed at https://reviews.apache.org/r/34124/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/c1b0dce4
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/c1b0dce4
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/c1b0dce4
Branch: refs/heads/master
Commit: c1b0dce41adedf6bed7fe6eb3b80d369f3b64b0a
Parents: 759ef68
Author: Maxim Khutornenko <ma...@apache.org>
Authored: Tue May 12 15:09:39 2015 -0700
Committer: Maxim Khutornenko <ma...@apache.org>
Committed: Tue May 12 15:09:39 2015 -0700
----------------------------------------------------------------------
.../apache/aurora/scheduler/state/SideEffect.java | 17 +----------------
.../aurora/scheduler/state/StateManagerImpl.java | 10 ----------
.../scheduler/state/TaskStateMachineTest.java | 3 ---
3 files changed, 1 insertion(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/c1b0dce4/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java b/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java
index 180852e..b91a085 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/SideEffect.java
@@ -16,7 +16,6 @@ package org.apache.aurora.scheduler.state;
import java.util.Objects;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import org.apache.aurora.gen.ScheduleStatus;
@@ -30,11 +29,6 @@ class SideEffect {
SideEffect(Action action, Optional<ScheduleStatus> nextState) {
this.action = action;
- if (action == Action.STATE_CHANGE) {
- Preconditions.checkArgument(
- nextState.isPresent(),
- "A next state must be provided for a state change action.");
- }
this.nextState = nextState;
}
@@ -42,10 +36,6 @@ class SideEffect {
return action;
}
- public Optional<ScheduleStatus> getNextState() {
- return nextState;
- }
-
@Override
public boolean equals(Object o) {
if (!(o instanceof SideEffect)) {
@@ -95,11 +85,6 @@ class SideEffect {
/**
* Increment the failure count for this task.
*/
- INCREMENT_FAILURES,
-
- /**
- * Perform an additional state change on the task.
- */
- STATE_CHANGE
+ INCREMENT_FAILURES
}
}
http://git-wip-us.apache.org/repos/asf/aurora/blob/c1b0dce4/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java b/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
index 2a943cf..d87bb38 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
@@ -260,7 +260,6 @@ public class StateManagerImpl implements StateManager {
private static final List<Action> ACTIONS_IN_ORDER = ImmutableList.of(
Action.INCREMENT_FAILURES,
Action.SAVE_STATE,
- Action.STATE_CHANGE,
Action.RESCHEDULE,
Action.KILL,
Action.DELETE);
@@ -341,15 +340,6 @@ public class StateManagerImpl implements StateManager {
stateMachine.getPreviousState()));
break;
- case STATE_CHANGE:
- updateTaskAndExternalState(
- taskStore,
- Optional.<ScheduleStatus>absent(),
- taskId,
- sideEffect.getNextState().get(),
- Optional.<String>absent());
- break;
-
case RESCHEDULE:
Preconditions.checkState(
upToDateTask.isPresent(),
http://git-wip-us.apache.org/repos/asf/aurora/blob/c1b0dce4/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
index b30a073..afbca61 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
@@ -353,9 +353,6 @@ public class TaskStateMachineTest {
private static final TransitionResult DELETE_TASK = new TransitionResult(
true,
ImmutableSet.of(new SideEffect(Action.DELETE, Optional.<ScheduleStatus>absent())));
- private static final TransitionResult MARK_LOST = new TransitionResult(
- false,
- ImmutableSet.of(new SideEffect(Action.STATE_CHANGE, Optional.of(LOST.getStatus().get()))));
private static final class TestCase {
private final boolean taskPresent;