Skip to content

Commit

Permalink
tweak
Browse files Browse the repository at this point in the history
  • Loading branch information
tpetr committed Feb 17, 2016
1 parent f565067 commit a785be1
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 28 deletions.
34 changes: 15 additions & 19 deletions SingularityBase/src/main/java/com/hubspot/singularity/SingularityTaskHistoryUpdate.java
View file
Expand Up @@ -2,8 +2,6 @@


import javax.annotation.Nonnull; import javax.annotation.Nonnull;


import org.apache.mesos.Protos;

import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Objects; import com.google.common.base.Objects;
Expand All @@ -17,8 +15,7 @@ public class SingularityTaskHistoryUpdate extends SingularityTaskIdHolder implem
private final long timestamp; private final long timestamp;
private final ExtendedTaskState taskState; private final ExtendedTaskState taskState;
private final Optional<String> statusMessage; private final Optional<String> statusMessage;
private final Optional<Protos.TaskStatus.Source> mesosSource; private final Optional<String> statusReason;
private final Optional<Protos.TaskStatus.Reason> mesosReason;


public enum SimplifiedTaskState { public enum SimplifiedTaskState {
UNKNOWN, WAITING, RUNNING, DONE UNKNOWN, WAITING, RUNNING, DONE
Expand Down Expand Up @@ -54,14 +51,13 @@ public static SimplifiedTaskState getCurrentState(Iterable<SingularityTaskHistor
} }


@JsonCreator @JsonCreator
public SingularityTaskHistoryUpdate(@JsonProperty("taskId") SingularityTaskId taskId, @JsonProperty("timestamp") long timestamp, @JsonProperty("taskState") ExtendedTaskState taskState, @JsonProperty("statusMessage") Optional<String> statusMessage, @JsonProperty("mesosSource") Optional<Protos.TaskStatus.Source> mesosSource, @JsonProperty("mesosReason") Optional<Protos.TaskStatus.Reason> mesosReason) { public SingularityTaskHistoryUpdate(@JsonProperty("taskId") SingularityTaskId taskId, @JsonProperty("timestamp") long timestamp, @JsonProperty("taskState") ExtendedTaskState taskState, @JsonProperty("statusMessage") Optional<String> statusMessage, @JsonProperty("statusReason") Optional<String> statusReason) {
super(taskId); super(taskId);


this.timestamp = timestamp; this.timestamp = timestamp;
this.taskState = taskState; this.taskState = taskState;
this.statusMessage = statusMessage; this.statusMessage = statusMessage;
this.mesosSource = mesosSource; this.statusReason = statusReason;
this.mesosReason = mesosReason;
} }


@Override @Override
Expand All @@ -75,7 +71,7 @@ public int compareTo(SingularityTaskHistoryUpdate o) {


@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hashCode(getTaskId(), timestamp, taskState, statusMessage); return Objects.hashCode(getTaskId(), timestamp, taskState, statusMessage, statusReason);
} }


@Override @Override
Expand All @@ -92,7 +88,8 @@ public boolean equals(Object other) {
return Objects.equal(this.getTaskId(), that.getTaskId()) return Objects.equal(this.getTaskId(), that.getTaskId())
&& Objects.equal(this.timestamp, that.timestamp) && Objects.equal(this.timestamp, that.timestamp)
&& Objects.equal(this.taskState, that.taskState) && Objects.equal(this.taskState, that.taskState)
&& Objects.equal(statusMessage, statusMessage); && Objects.equal(this.statusMessage, that.statusMessage)
&& Objects.equal(this.statusReason, that.statusReason);
} }


public long getTimestamp() { public long getTimestamp() {
Expand All @@ -107,17 +104,16 @@ public Optional<String> getStatusMessage() {
return statusMessage; return statusMessage;
} }


public Optional<Protos.TaskStatus.Source> getMesosSource() { public Optional<String> getStatusReason() {
return mesosSource; return statusReason;
} }


public Optional<Protos.TaskStatus.Reason> getMesosReason() { @Override public String toString() {
return mesosReason; return "SingularityTaskHistoryUpdate[" +
"timestamp=" + timestamp +
", taskState=" + taskState +
", statusMessage=" + statusMessage +
", statusReason=" + statusReason +
']';
} }

@Override
public String toString() {
return "SingularityTaskHistoryUpdate [taskId=" + getTaskId() + ", timestamp=" + timestamp + ", taskState=" + taskState + ", statusMessage=" + statusMessage + "]";
}

} }
4 changes: 2 additions & 2 deletions SingularityService/src/main/java/com/hubspot/singularity/data/TaskManager.java
View file
Expand Up @@ -574,7 +574,7 @@ private void createTaskAndDeletePendingTaskPrivate(SingularityTask task) throws
msg = String.format("%s (%s)", msg, task.getTaskRequest().getPendingTask().getMessage().get()); msg = String.format("%s (%s)", msg, task.getTaskRequest().getPendingTask().getMessage().get());
} }


saveTaskHistoryUpdate(new SingularityTaskHistoryUpdate(task.getTaskId(), now, ExtendedTaskState.TASK_LAUNCHED, Optional.of(msg))); saveTaskHistoryUpdate(new SingularityTaskHistoryUpdate(task.getTaskId(), now, ExtendedTaskState.TASK_LAUNCHED, Optional.of(msg), Optional.<String>absent()));
saveLastActiveTaskStatus(new SingularityTaskStatusHolder(task.getTaskId(), Optional.<TaskStatus>absent(), now, serverId, Optional.of(task.getOffer().getSlaveId().getValue()))); saveLastActiveTaskStatus(new SingularityTaskStatusHolder(task.getTaskId(), Optional.<TaskStatus>absent(), now, serverId, Optional.of(task.getOffer().getSlaveId().getValue())));


try { try {
Expand Down Expand Up @@ -686,7 +686,7 @@ private void saveTaskHistoryUpdate(SingularityTaskCleanup cleanup) {
msg.append(cleanup.getMessage().get()); msg.append(cleanup.getMessage().get());
} }


saveTaskHistoryUpdate(new SingularityTaskHistoryUpdate(cleanup.getTaskId(), cleanup.getTimestamp(), ExtendedTaskState.TASK_CLEANING, Optional.of(msg.toString()))); saveTaskHistoryUpdate(new SingularityTaskHistoryUpdate(cleanup.getTaskId(), cleanup.getTimestamp(), ExtendedTaskState.TASK_CLEANING, Optional.of(msg.toString()), Optional.<String>absent()));
} }


public SingularityCreateResult createTaskCleanup(SingularityTaskCleanup cleanup) { public SingularityCreateResult createTaskCleanup(SingularityTaskCleanup cleanup) {
Expand Down
2 changes: 1 addition & 1 deletion ...ularityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosScheduler.java
View file
Expand Up @@ -358,7 +358,7 @@ public void statusUpdate(SchedulerDriver driver, Protos.TaskStatus status) {
} }


final SingularityTaskHistoryUpdate taskUpdate = final SingularityTaskHistoryUpdate taskUpdate =
new SingularityTaskHistoryUpdate(taskIdObj, timestamp, taskState, status.hasMessage() ? Optional.of(status.getMessage()) : Optional.<String>absent(), status.hasSource() ? Optional.of(status.getSource()) : Optional.<Protos.TaskStatus.Source>absent(), status.hasReason() ? Optional.of(status.getReason()) : Optional.<Protos.TaskStatus.Reason>absent()); new SingularityTaskHistoryUpdate(taskIdObj, timestamp, taskState, status.hasMessage() ? Optional.of(status.getMessage()) : Optional.<String>absent(), status.hasReason() ? Optional.of(status.getReason().name()) : Optional.<String>absent());
final SingularityCreateResult taskHistoryUpdateCreateResult = taskManager.saveTaskHistoryUpdate(taskUpdate); final SingularityCreateResult taskHistoryUpdateCreateResult = taskManager.saveTaskHistoryUpdate(taskUpdate);


logSupport.checkDirectory(taskIdObj); logSupport.checkDirectory(taskIdObj);
Expand Down
6 changes: 3 additions & 3 deletions SingularityService/src/test/java/com/hubspot/singularity/scheduler/MesosUtilsTest.java
View file
Expand Up @@ -36,9 +36,9 @@ public void testTaskOrdering() {
final SingularityTaskId taskId = new SingularityTaskId("r", "d", System.currentTimeMillis(), 1, "h", "r"); final SingularityTaskId taskId = new SingularityTaskId("r", "d", System.currentTimeMillis(), 1, "h", "r");
final Optional<String> msg = Optional.absent(); final Optional<String> msg = Optional.absent();


SingularityTaskHistoryUpdate update1 = new SingularityTaskHistoryUpdate(taskId, 1L, ExtendedTaskState.TASK_LAUNCHED, msg); SingularityTaskHistoryUpdate update1 = new SingularityTaskHistoryUpdate(taskId, 1L, ExtendedTaskState.TASK_LAUNCHED, msg, Optional.<String>absent());
SingularityTaskHistoryUpdate update2 = new SingularityTaskHistoryUpdate(taskId, 2L, ExtendedTaskState.TASK_RUNNING, msg); SingularityTaskHistoryUpdate update2 = new SingularityTaskHistoryUpdate(taskId, 2L, ExtendedTaskState.TASK_RUNNING, msg, Optional.<String>absent());
SingularityTaskHistoryUpdate update3 = new SingularityTaskHistoryUpdate(taskId, 2L, ExtendedTaskState.TASK_FAILED, msg); SingularityTaskHistoryUpdate update3 = new SingularityTaskHistoryUpdate(taskId, 2L, ExtendedTaskState.TASK_FAILED, msg, Optional.<String>absent());


List<SingularityTaskHistoryUpdate> list = Arrays.asList(update2, update1, update3); List<SingularityTaskHistoryUpdate> list = Arrays.asList(update2, update1, update3);


Expand Down
6 changes: 3 additions & 3 deletions ...rityService/src/test/java/com/hubspot/singularity/scheduler/SingularitySchedulerTest.java
View file
Expand Up @@ -797,7 +797,7 @@ public void testSlavePlacementSeparate() {
Assert.assertTrue(taskManager.getPendingTaskIds().size() == 1); Assert.assertTrue(taskManager.getPendingTaskIds().size() == 1);
Assert.assertTrue(taskManager.getActiveTaskIds().size() == 1); Assert.assertTrue(taskManager.getActiveTaskIds().size() == 1);


eventListener.taskHistoryUpdateEvent(new SingularityTaskHistoryUpdate(taskManager.getActiveTaskIds().get(0), System.currentTimeMillis(), ExtendedTaskState.TASK_CLEANING, Optional.<String>absent())); eventListener.taskHistoryUpdateEvent(new SingularityTaskHistoryUpdate(taskManager.getActiveTaskIds().get(0), System.currentTimeMillis(), ExtendedTaskState.TASK_CLEANING, Optional.<String>absent(), Optional.<String>absent()));


sms.resourceOffers(driver, Arrays.asList(createOffer(20, 20000, "slave1", "host1"))); sms.resourceOffers(driver, Arrays.asList(createOffer(20, 20000, "slave1", "host1")));


Expand Down Expand Up @@ -829,7 +829,7 @@ public void testSlavePlacementOptimistic() {


sms.resourceOffers(driver, Arrays.asList(createOffer(20, 20000, "slave2", "host2"))); sms.resourceOffers(driver, Arrays.asList(createOffer(20, 20000, "slave2", "host2")));


eventListener.taskHistoryUpdateEvent(new SingularityTaskHistoryUpdate(taskManager.getActiveTaskIds().get(0), System.currentTimeMillis(), ExtendedTaskState.TASK_CLEANING, Optional.<String>absent())); eventListener.taskHistoryUpdateEvent(new SingularityTaskHistoryUpdate(taskManager.getActiveTaskIds().get(0), System.currentTimeMillis(), ExtendedTaskState.TASK_CLEANING, Optional.<String>absent(), Optional.<String>absent()));


Assert.assertTrue(taskManager.getPendingTaskIds().isEmpty()); Assert.assertTrue(taskManager.getPendingTaskIds().isEmpty());
Assert.assertTrue(taskManager.getActiveTaskIds().size() == 3); Assert.assertTrue(taskManager.getActiveTaskIds().size() == 3);
Expand All @@ -844,7 +844,7 @@ public void testSlavePlacementOptimisticSingleOffer() {


sms.resourceOffers(driver, Arrays.asList(createOffer(20, 20000, "slave1", "host1"), createOffer(20, 20000, "slave2", "host2"))); sms.resourceOffers(driver, Arrays.asList(createOffer(20, 20000, "slave1", "host1"), createOffer(20, 20000, "slave2", "host2")));


eventListener.taskHistoryUpdateEvent(new SingularityTaskHistoryUpdate(taskManager.getActiveTaskIds().get(0), System.currentTimeMillis(), ExtendedTaskState.TASK_CLEANING, Optional.<String>absent())); eventListener.taskHistoryUpdateEvent(new SingularityTaskHistoryUpdate(taskManager.getActiveTaskIds().get(0), System.currentTimeMillis(), ExtendedTaskState.TASK_CLEANING, Optional.<String>absent(), Optional.<String>absent()));


Assert.assertTrue(taskManager.getPendingTaskIds().isEmpty()); Assert.assertTrue(taskManager.getPendingTaskIds().isEmpty());
Assert.assertTrue(taskManager.getActiveTaskIds().size() == 3); Assert.assertTrue(taskManager.getActiveTaskIds().size() == 3);
Expand Down

0 comments on commit a785be1

Please sign in to comment.