IGNITE-9631 Added test worker interruption to prevent ZK suite timeout - Fixes #4782.
Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85a951da Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85a951da Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85a951da Branch: refs/heads/ignite-7251 Commit: 85a951da996ebb4782d75f54bc975ba893d109e1 Parents: 9ece644 Author: Alexey Platonov <aplaton...@gmail.com> Authored: Tue Sep 18 18:11:58 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Sep 18 18:13:44 2018 +0300 ---------------------------------------------------------------------- .../distributed/GridCacheAbstractNodeRestartSelfTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/85a951da/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 8e69e43..f32aab5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -684,7 +684,12 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs } for (Thread t : threads) - t.join(); + t.join(2 * duration); + + for (Thread t : threads) { + if (t.isAlive()) + t.interrupt(); + } if (err.get() != null) throw err.get(); @@ -1016,4 +1021,4 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs error("Attempt: " + attempt); error("Node: " + ignite.cluster().localNode().id()); } -} \ No newline at end of file +}
