Skip to content

IGNITE-28189 Fixed incorrect status of a Compute Task when it is canceled #12876

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

Open
petrov-mg wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −12
Open

IGNITE-28189 Fixed incorrect status of a Compute Task when it is canceled #12876

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
27 changes: 15 additions & 12 deletions modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,23 +748,21 @@ else if (sysStopping && X.hasCause(e, InterruptedException.class, IgniteInterrup
*/
public void cancel(boolean sys) {
try {
final ComputeJob job0 = job;
if (log.isDebugEnabled())
log.debug("Cancelling job: " + ses);

status = CANCELLED;

if (sys)
sysCancelled = true;

if (job0 != null) {
if (log.isDebugEnabled())
log.debug("Cancelling job: " + ses);

status = CANCELLED;
final ComputeJob job0 = job;

U.wrapThreadLoader(dep.classLoader(), (IgniteRunnable)() -> {
try (Scope ignored = ctx.security().withContext(secCtx)) {
job0.cancel();
}
});
}
U.wrapThreadLoader(dep.classLoader(), (IgniteRunnable)() -> {
try (Scope ignored = ctx.security().withContext(secCtx)) {
job0.cancel();
}
});

// Interrupting only when all 'cancelled' flags are set.
// This allows the 'job' to determine it's a cancellation.
Expand Down Expand Up @@ -1091,6 +1089,11 @@ ComputeJobStatusEnum status() {
return jobId.hashCode();
}

/** {@inheritDoc} */
@Override public boolean isCancelled() {
return status == CANCELLED;
}

/** {@inheritDoc} */
@Override protected void onCancel(boolean firstCancelRequest) {
if (firstCancelRequest)
Expand Down
Loading