Skip to content

DS-1044: Fix EMR event handling to also handle "CANCELLING" state #1502

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
roegi merged 1 commit into from
Apr 7, 2025
Merged

DS-1044: Fix EMR event handling to also handle "CANCELLING" state #1502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions xyz-jobs/xyz-job-service/src/main/java/com/here/xyz/jobs/Job.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ private Future<Void> startExecution(boolean resume) {
* @return A future providing a boolean telling whether the action was performed already.
*/
public Future<Boolean> cancel() {
logger.info("[{}] Cancelling job ...", getId());
getStatus().setState(CANCELLING);

return storeStatus(null)
Expand Down Expand Up @@ -306,15 +307,15 @@ public Future<Void> updateStepStatus(String stepId, RuntimeInfo status, boolean
State existingStepState = step.getStatus().getState();

step.getStatus()
.withState(status.getState())
.withErrorCode(status.getErrorCode())
.withErrorCause(status.getErrorCause())
.withErrorMessage(status.getErrorMessage());
.withState(status.getState())
.withErrorCode(status.getErrorCode())
.withErrorCause(status.getErrorCause())
.withErrorMessage(status.getErrorMessage());

return updateStep(step, existingStepState, cancelOnFailure);
}

private Future<Void> updateStep(Step<?> step, State previousStepState, boolean cancelOnFailure) {
private Future<Void> updateStep(Step step, State previousStepState, boolean cancelOnFailure) {
//TODO: Once the state was SUCCEEDED it should not be mutable at all anymore
if (previousStepState != null && !step.getStatus().getState().isFinal() && previousStepState.isFinal())
//In case the step was already marked to have a final state, ignore any subsequent non-final updates to it
Expand Down Expand Up @@ -364,6 +365,7 @@ private Future<Void> updatePreviousAttempts(Step step) {
* @return A future providing a boolean telling whether the action was performed already.
*/
public Future<Boolean> resume() {
logger.info("[{}] Resuming job ...", getId());
if (isResumable()) {
getStatus().setState(RESUMING);
getSteps().stepStream().forEach(step -> {
Expand Down
1 change: 1 addition & 0 deletions xyz-jobs/xyz-job-service/src/main/java/com/here/xyz/jobs/service/JobAdminApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ private void processEmrJobStateChangeEvent(JsonObject event) {
State newStepState = switch (emrJobStatus) {
case "RUNNING" -> RUNNING;
case "SUCCESS" -> SUCCEEDED;
case "CANCELLING" -> CANCELLING;
case "CANCELLED" -> CANCELLED;
case "FAILED" -> FAILED;
default -> null;
Expand Down