Skip to content

Add decom reasons to task cleaning messages #2272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pschoenfelder merged 2 commits into from
Mar 11, 2022
Merged

Add decom reasons to task cleaning messages #2272

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
409e24d
Add decom reasons to task cleaning messages
pschoenfelder Mar 7, 2022
8bb3e95
Cleanup
pschoenfelder Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.hubspot.singularity.SingularityDeployStatisticsBuilder;
import com.hubspot.singularity.SingularityKilledTaskIdRecord;
import com.hubspot.singularity.SingularityMachineAbstraction;
import com.hubspot.singularity.SingularityMachineStateHistoryUpdate;
import com.hubspot.singularity.SingularityMainModule;
import com.hubspot.singularity.SingularityManagedThreadPoolFactory;
import com.hubspot.singularity.SingularityPendingDeploy;
Expand Down Expand Up @@ -152,7 +153,8 @@ private void cleanupTaskDueToDecomission(
final Map<String, Optional<String>> requestIdsToUserToReschedule,
final Set<SingularityTaskId> matchingTaskIds,
SingularityTask task,
SingularityMachineAbstraction<?> decommissioningObject
SingularityMachineAbstraction<?> decommissioningObject,
Optional<String> decomissionReason
) {
requestIdsToUserToReschedule.put(
task.getTaskRequest().getRequest().getId(),
Expand All @@ -175,9 +177,10 @@ private void cleanupTaskDueToDecomission(
task.getTaskId(),
Optional.of(
String.format(
"%s %s is decomissioning",
"%s %s is decomissioning%s",
decommissioningObject.getTypeName(),
decommissioningObject.getName()
decommissioningObject.getName(),
decomissionReason.map(r -> String.format(" (message: %s)", r)).orElse("")
)
),
Optional.<String>empty(),
Expand Down Expand Up @@ -211,6 +214,15 @@ public void checkForDecomissions() {

for (SingularityAgent agent : agents.keySet()) {
boolean foundTask = false;
List<SingularityMachineStateHistoryUpdate> history = agentManager.getHistory(
agent.getId()
);

SingularityMachineStateHistoryUpdate stateHistoryUpdate = history
.stream()
.filter(update -> update.getState() == MachineState.STARTING_DECOMMISSION)
.max(Comparator.comparing(SingularityMachineStateHistoryUpdate::getTimestamp))
.get();

for (SingularityTask activeTask : taskManager.getTasksOnAgent(
activeTaskIds,
Expand All @@ -220,7 +232,8 @@ public void checkForDecomissions() {
requestIdsToUserToReschedule,
matchingTaskIds,
activeTask,
agent
agent,
stateHistoryUpdate.getMessage()
);
foundTask = true;
}
Expand Down Expand Up @@ -256,7 +269,8 @@ public void checkForDecomissions() {
requestIdsToUserToReschedule,
matchingTaskIds,
maybeTask.get(),
rack
rack,
Optional.empty()
);
}
}
Expand Down