[Backport 8.0] Cancel job with incident when canceling the process instance #9251
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adds a regression test against activating jobs of cancelled process instances, by making sure they are cancelled (i.e. deleted). In this specific case, an uncaught error was thrown on a job which led to an UNHANDLED_ERROR_EVENT incident. When the process instance is cancelled, the job was not called, but instead was made activatable again. This happened, because the incident was resolved as part of the process instance termination logic. Instead, we should guarantee that the job is cancelled. A cancelled job can no longer be made re-activatable. This is a terminal state for jobs, because a cancelled job is a deleted job. See #8588 for more details. (cherry picked from commit d43c344)
This makes it easier to add more values to the predicate, while staying understandable. (cherry picked from commit da40a20)
Jobs in the error_thrown state should also be able to be cancelled. By adding it to this list, we make sure that the job with error_thrown state can be cancelled by the engine when the element it belongs to is being terminated. (cherry picked from commit 57fc9da)
We need to make sure the job is cancelled immediately (synchronously) because otherwise the IncidentResolvedApplier may still make the job activatable again. To cancel the job immediately we simply need to use the statewriter to write Job Cancelled, instead of using the commandwriter to write Cancel Job. The statewriter will immediately apply the event when writing it. (cherry picked from commit 657ca08)
Since the command is no longer written, the test cases that were verifying that the command was written should be updated to verify that the job canceled event is written in the same spot. Note that in the BoundaryEventTest it highlights the difference between asynchronously canceling the job with a command and synchronously (immediately) canceling the job with an event. (cherry picked from commit b9372a5)
The ability to read a metric value will be useful in future Metrics tests. (cherry picked from commit 74fe956)
This adds tests that verify that the job metrics are counted when expected. Note that the `shouldCountCanceled` case fails, because canceling the job was no longer counted in the metrics. (cherry picked from commit d9b3413)
This behavior was broken in an earlier commit, when we switched from writing a Cancel Job command to a Job Canceled event. (cherry picked from commit 0aac0d7)
It's important to highlight duplication, because if either changes, the other should be changed as well. (cherry picked from commit 25fae05)
|
@pihme Please have a look, no need for a full review as the cherry-picking was without conflicts. The automatic backporting had failed because the other one had already failed. IMO, this just needs an approval and we can merge it |
pihme
approved these changes
Apr 28, 2022
|
bors merge |
zeebe-bors-camunda bot
added a commit
that referenced
this pull request
Apr 28, 2022
9251: [Backport 8.0] Cancel job with incident when canceling the process instance r=korthout a=korthout ## Description <!-- Link to the PR that is back ported --> Backport of #9219 ## Related issues <!-- Link to the related issues of the origin PR --> closes #8588 Co-authored-by: Nico Korthout <nico.korthout@camunda.com>
|
Build failed: |
|
Forking failed. bors retry |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Backport of #9219
Related issues
closes #8588