You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/08/02 10:38:22 UTC
[04/17] ignite git commit: IGNITE-5775: Fix removing jobs from
activeJobs for jobAlwaysActivate. This closes #2319.
IGNITE-5775: Fix removing jobs from activeJobs for jobAlwaysActivate. This closes #2319.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40c91c59
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40c91c59
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40c91c59
Branch: refs/heads/ignite-5578-debug
Commit: 40c91c5983c4237b329f0e0b532d8ba2d9ae9743
Parents: 160dab0
Author: Evgenii Zhuravlev <ez...@gridgain.com>
Authored: Tue Aug 1 17:28:45 2017 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Tue Aug 1 17:37:21 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/job/GridJobProcessor.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/40c91c59/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index cc8d903..9052543 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -1785,6 +1785,11 @@ public class GridJobProcessor extends GridProcessorAdapter {
if (jobAlwaysActivate) {
if (metricsUpdateFreq > -1L)
updateJobMetrics();
+
+ if (!activeJobs.remove(worker.getJobId(), worker))
+ cancelledJobs.remove(worker.getJobId(), worker);
+
+ heldJobs.remove(worker.getJobId());
}
else {
if (!rwLock.tryReadLock()) {