You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2021/05/27 09:23:04 UTC
[ignite] branch master updated: IGNITE-14783
SystemViewComputeJobTest.testCancelComputeTask fixed (#9129)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 3e9043c IGNITE-14783 SystemViewComputeJobTest.testCancelComputeTask fixed (#9129)
3e9043c is described below
commit 3e9043c29c173a78fa89ce41ab1489f0de0c6a82
Author: Sergei Ryzhov <s....@gmail.com>
AuthorDate: Thu May 27 12:22:45 2021 +0300
IGNITE-14783 SystemViewComputeJobTest.testCancelComputeTask fixed (#9129)
---
.../ignite/internal/metric/SystemViewComputeJobTest.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewComputeJobTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewComputeJobTest.java
index 823607a..32b2a62 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewComputeJobTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewComputeJobTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTask;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteClosure;
@@ -68,7 +69,7 @@ public class SystemViewComputeJobTest extends GridCommonAbstractTest {
public static final long TIMEOUT = 10_000L;
/** */
- private static CyclicBarrier barrier;
+ private static volatile CyclicBarrier barrier;
/** */
private static IgniteEx server;
@@ -447,12 +448,13 @@ public class SystemViewComputeJobTest extends GridCommonAbstractTest {
}
/** Check job fields. */
- private void checkJobView(ComputeJobView job) {
+ private void checkJobView(ComputeJobView job) throws IgniteInterruptedCheckedException {
checkJobView(job, getClass().getName(), ACTIVE);
}
/** Check job fields. */
- private void checkJobView(ComputeJobView job, String taskPrefix, ComputeJobState state) {
+ private void checkJobView(ComputeJobView job, String taskPrefix, ComputeJobState state)
+ throws IgniteInterruptedCheckedException {
assertFalse(job.isInternal());
assertNull(job.affinityCacheIds());
assertEquals(-1, job.affinityPartitionId());
@@ -460,12 +462,16 @@ public class SystemViewComputeJobTest extends GridCommonAbstractTest {
assertTrue(job.taskName().startsWith(taskPrefix));
assertEquals(client.localNode().id(), job.originNodeId());
assertEquals(state, job.state());
- assertEquals(0, job.finishTime());
if (state == ACTIVE) {
assertTrue(job.startTime() > 0);
assertTrue(job.isStarted());
}
+
+ if (state == CANCELED)
+ assertTrue(waitForCondition(() -> job.finishTime() > 0, TIMEOUT));
+ else
+ assertEquals(0, job.finishTime());
}
/** */