http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java new file mode 100644 index 0000000..cc7f86f --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java @@ -0,0 +1,88 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.spi.failover.jobstealing; + +import org.apache.ignite.cluster.*; +import org.gridgain.grid.*; +import org.gridgain.grid.kernal.*; +import org.apache.ignite.spi.collision.jobstealing.*; +import org.apache.ignite.spi.failover.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.gridgain.testframework.*; +import org.gridgain.testframework.junits.spi.*; + +import java.util.*; + +/** + * Job stealing failover SPI test for one node. + */ +@GridSpiTest(spi = JobStealingFailoverSpi.class, group = "Failover SPI") +public class GridJobStealingFailoverSpiOneNodeSelfTest extends GridSpiAbstractTest<JobStealingFailoverSpi> { + /** {@inheritDoc} */ + @Override protected GridSpiTestContext initSpiContext() throws Exception { + GridSpiTestContext ctx = super.initSpiContext(); + + ctx.setLocalNode(addSpiDependency(new GridTestNode(UUID.randomUUID()))); + + ctx.addNode(addSpiDependency(new GridTestNode(UUID.randomUUID()))); + + return ctx; + } + + /** + * Adds Collision SPI attribute. + * + * @param node Node to add attribute to. + * @return Passed in node. + * @throws Exception If failed. + */ + private ClusterNode addSpiDependency(GridTestNode node) throws Exception { + node.addAttribute( + U.spiAttribute(getSpi(), GridNodeAttributes.ATTR_SPI_CLASS), + JobStealingCollisionSpi.class.getName()); + + node.addAttribute( + U.spiAttribute(getSpi(), GridNodeAttributes.ATTR_SPI_CLASS), + JobStealingCollisionSpi.class.getName()); + + return node; + } + + /** + * @throws Exception If test failed. + */ + public void testFailover() throws Exception { + ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + failed.getJobContext().setAttribute(JobStealingCollisionSpi.THIEF_NODE_ATTR, + getSpiContext().localNode().id()); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + Collections.singletonList(getSpiContext().remoteNodes().iterator().next())); + + assert other == rmt : "Invalid failed-over node: " + other; + } + + /** + * @throws Exception If test failed. + */ + public void testNoFailover() throws Exception { + ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + Collections.singletonList(getSpiContext().remoteNodes().iterator().next())); + + assert other == null; + } +}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java new file mode 100644 index 0000000..321a95b --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java @@ -0,0 +1,217 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.spi.failover.jobstealing; + +import org.apache.ignite.cluster.*; +import org.apache.ignite.compute.*; +import org.gridgain.grid.*; +import org.apache.ignite.spi.collision.jobstealing.*; +import org.apache.ignite.spi.failover.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.gridgain.testframework.*; +import org.gridgain.testframework.junits.spi.*; + +import java.util.*; + +import static org.gridgain.grid.kernal.GridNodeAttributes.*; +import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.*; +import static org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi.*; + +/** + * Self test for {@link JobStealingFailoverSpi} SPI. + */ +@GridSpiTest(spi = JobStealingFailoverSpi.class, group = "Failover SPI") +public class GridJobStealingFailoverSpiSelfTest extends GridSpiAbstractTest<JobStealingFailoverSpi> { + /** {@inheritDoc} */ + @Override protected GridSpiTestContext initSpiContext() throws Exception { + GridSpiTestContext ctx = super.initSpiContext(); + + GridTestNode loc = new GridTestNode(UUID.randomUUID()); + + addSpiDependency(loc); + + ctx.setLocalNode(loc); + + GridTestNode rmt = new GridTestNode(UUID.randomUUID()); + + ctx.addNode(rmt); + + addSpiDependency(rmt); + + return ctx; + } + + /** + * Adds Collision SPI attribute. + * + * @param node Node to add attribute to. + * @throws Exception If failed. + */ + private void addSpiDependency(GridTestNode node) throws Exception { + node.addAttribute(ATTR_SPI_CLASS, JobStealingCollisionSpi.class.getName()); + + node.setAttribute(U.spiAttribute(getSpi(), ATTR_SPI_CLASS), getSpi().getClass().getName()); + } + + /** + * @throws Exception If test failed. + */ + public void testFailover() throws Exception { + ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + failed.getJobContext().setAttribute(THIEF_NODE_ATTR, + getSpiContext().localNode().id()); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + new ArrayList<>(getSpiContext().nodes())); + + assert other == getSpiContext().localNode(); + + // This is not a failover but stealing. + checkAttributes(failed.getJobContext(), null, 0); + } + + /** + * @throws Exception If test failed. + */ + public void testMaxHopsExceeded() throws Exception { + ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + failed.getJobContext().setAttribute(THIEF_NODE_ATTR, + getSpiContext().localNode().id()); + failed.getJobContext().setAttribute(FAILOVER_ATTEMPT_COUNT_ATTR, + getSpi().getMaximumFailoverAttempts()); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + new ArrayList<>(getSpiContext().nodes())); + + assert other == null; + } + + /** + * @throws Exception If test failed. + */ + public void testMaxHopsExceededThiefNotSet() throws Exception { + ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + failed.getJobContext().setAttribute(FAILOVER_ATTEMPT_COUNT_ATTR, + getSpi().getMaximumFailoverAttempts()); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + new ArrayList<>(getSpiContext().nodes())); + + assert other == null; + } + + /** + * @throws Exception If test failed. + */ + public void testNonZeroFailoverCount() throws Exception { + ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + failed.getJobContext().setAttribute(FAILOVER_ATTEMPT_COUNT_ATTR, + getSpi().getMaximumFailoverAttempts() - 1); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + new ArrayList<>(getSpiContext().nodes())); + + assert other != null; + assert other != rmt; + + assert other == getSpiContext().localNode(); + + checkAttributes(failed.getJobContext(), rmt, getSpi().getMaximumFailoverAttempts()); + } + + /** + * @throws Exception If test failed. + */ + public void testThiefNotInTopology() throws Exception { + ClusterNode rmt = new GridTestNode(UUID.randomUUID()); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + failed.getJobContext().setAttribute(THIEF_NODE_ATTR, rmt.id()); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + new ArrayList<>(getSpiContext().nodes())); + + assert other != null; + assert other != rmt; + + assert getSpiContext().nodes().contains(other); + + checkAttributes(failed.getJobContext(), rmt, 1); + } + + /** + * @throws Exception If test failed. + */ + public void testThiefEqualsVictim() throws Exception { + ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + failed.getJobContext().setAttribute(THIEF_NODE_ATTR, rmt.id()); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + new ArrayList<>(getSpiContext().nodes())); + + assert other != null; + assert other != rmt; + + assert other.equals(getSpiContext().localNode()); + + checkAttributes(failed.getJobContext(), rmt, 1); + } + + /** + * @throws Exception If test failed. + */ + public void testThiefIdNotSet() throws Exception { + ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); + + GridTestJobResult failed = new GridTestJobResult(rmt); + + ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), + new ArrayList<>(getSpiContext().nodes())); + + assert other != null; + assert other != rmt; + + assert other.equals(getSpiContext().localNode()); + + checkAttributes(failed.getJobContext(), rmt, 1); + } + + /** + * @param ctx Failed job context. + * @param failed Failed node. + * @param failCnt Failover count. + */ + @SuppressWarnings("unchecked") + private void checkAttributes(ComputeJobContext ctx, ClusterNode failed, int failCnt) { + assert (Integer)ctx.getAttribute(FAILOVER_ATTEMPT_COUNT_ATTR) == failCnt; + + if (failed != null) { + Collection<UUID> failedSet = (Collection<UUID>)ctx.getAttribute(FAILED_NODE_LIST_ATTR); + + assert failedSet.contains(failed.id()); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java new file mode 100644 index 0000000..d8e12dc --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java @@ -0,0 +1,46 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.spi.failover.jobstealing; + +import org.gridgain.grid.kernal.*; +import org.gridgain.grid.spi.*; +import org.apache.ignite.spi.collision.jobstealing.*; +import org.apache.ignite.spi.failover.*; +import org.gridgain.testframework.*; +import org.gridgain.testframework.junits.spi.*; +import java.util.*; + +/** + * Job stealing failover SPI start-stop test. + */ +@GridSpiTest(spi = JobStealingFailoverSpi.class, group = "Failover SPI") +public class GridJobStealingFailoverSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<FailoverSpi> { + /** {@inheritDoc} */ + @Override protected GridSpiTestContext initSpiContext() throws Exception { + GridSpiTestContext ctx = super.initSpiContext(); + + GridTestNode locNode = new GridTestNode(UUID.randomUUID()); + + addSpiDependency(locNode); + + ctx.setLocalNode(locNode); + + return ctx; + } + + /** + * Adds Failover SPI attribute. + * + * @param node Node to add attribute to. + */ + private void addSpiDependency(GridTestNode node) { + node.addAttribute(GridNodeAttributes.ATTR_SPI_CLASS, JobStealingCollisionSpi.class.getName()); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package.html b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package.html new file mode 100644 index 0000000..5cad80a --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package.html @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<!-- + @html.file.header + _________ _____ __________________ _____ + __ ____/___________(_)______ /__ ____/______ ____(_)_______ + _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ +--> +<html> +<body> + <!-- Package description. --> + Contains internal tests or test related classes and interfaces. +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/apache/ignite/spi/failover/never/GridNeverFailoverSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/never/GridNeverFailoverSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/never/GridNeverFailoverSpiSelfTest.java new file mode 100644 index 0000000..c5ab621 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/never/GridNeverFailoverSpiSelfTest.java @@ -0,0 +1,37 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.spi.failover.never; + +import org.apache.ignite.cluster.*; +import org.gridgain.grid.*; +import org.apache.ignite.spi.failover.*; +import org.gridgain.testframework.*; +import org.gridgain.testframework.junits.spi.*; +import java.util.*; + +/** + * Never failover SPI test. + */ +@GridSpiTest(spi = NeverFailoverSpi.class, group = "Failover SPI") +public class GridNeverFailoverSpiSelfTest extends GridSpiAbstractTest<NeverFailoverSpi> { + /** + * @throws Exception If failed. + */ + public void testAlwaysNull() throws Exception { + List<ClusterNode> nodes = new ArrayList<>(); + + ClusterNode node = new GridTestNode(UUID.randomUUID()); + + nodes.add(node); + + assert getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), new GridTestJobResult(node)), + nodes) == null; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/apache/ignite/spi/failover/never/GridNeverFailoverSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/never/GridNeverFailoverSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/never/GridNeverFailoverSpiStartStopSelfTest.java new file mode 100644 index 0000000..87cd0d0 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/never/GridNeverFailoverSpiStartStopSelfTest.java @@ -0,0 +1,22 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.spi.failover.never; + +import org.gridgain.grid.spi.*; +import org.apache.ignite.spi.failover.*; +import org.gridgain.testframework.junits.spi.*; + +/** + * Never-failover SPI start-stop test. + */ +@GridSpiTest(spi = NeverFailoverSpi.class, group = "Failover SPI") +public class GridNeverFailoverSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<FailoverSpi> { + // No-op. +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/apache/ignite/spi/failover/never/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/never/package.html b/modules/core/src/test/java/org/apache/ignite/spi/failover/never/package.html new file mode 100644 index 0000000..5cad80a --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/never/package.html @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<!-- + @html.file.header + _________ _____ __________________ _____ + __ ____/___________(_)______ /__ ____/______ ____(_)_______ + _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ +--> +<html> +<body> + <!-- Package description. --> + Contains internal tests or test related classes and interfaces. +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/apache/ignite/spi/failover/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/package.html b/modules/core/src/test/java/org/apache/ignite/spi/failover/package.html new file mode 100644 index 0000000..5cad80a --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/package.html @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<!-- + @html.file.header + _________ _____ __________________ _____ + __ ____/___________(_)______ /__ ____/______ ____(_)_______ + _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ +--> +<html> +<body> + <!-- Package description. --> + Contains internal tests or test related classes and interfaces. +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java index 9167dac..6854d72 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java @@ -14,8 +14,8 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java index 1535a8c..a70907b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java @@ -15,8 +15,8 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java index e800413..9a5c38f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java @@ -15,7 +15,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java index 284d38b..4658fa1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java @@ -8,8 +8,8 @@ import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java index b92bc2f..e04990e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java @@ -15,8 +15,8 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java index 463e14a..89ec9d7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java @@ -18,7 +18,7 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.apache.ignite.spi.collision.jobstealing.*; -import org.gridgain.grid.spi.failover.jobstealing.*; +import org.apache.ignite.spi.failover.jobstealing.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.config.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java index 4855ae4..11f4f04 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java @@ -16,7 +16,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.apache.ignite.spi.collision.jobstealing.*; -import org.gridgain.grid.spi.failover.jobstealing.*; +import org.apache.ignite.spi.failover.jobstealing.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java index 6a999ec..33b1086 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java @@ -17,8 +17,8 @@ import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.gridgain.grid.*; import org.apache.ignite.spi.checkpoint.sharedfs.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.grid.spi.loadbalancing.roundrobin.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java index a5da434..aa11dce 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java @@ -16,7 +16,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.apache.ignite.spi.collision.jobstealing.*; -import org.gridgain.grid.spi.failover.jobstealing.*; +import org.apache.ignite.spi.failover.jobstealing.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java index de78b44..ca2905a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java @@ -16,7 +16,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; import org.gridgain.grid.*; import org.apache.ignite.spi.deployment.*; -import org.gridgain.grid.spi.eventstorage.*; +import org.apache.ignite.spi.eventstorage.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java index 5ca4f9d..5fac96b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java @@ -15,7 +15,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java index 053056b..1776054 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java @@ -32,9 +32,9 @@ import org.apache.ignite.spi.deployment.*; import org.apache.ignite.spi.deployment.local.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; -import org.gridgain.grid.spi.eventstorage.*; -import org.gridgain.grid.spi.eventstorage.memory.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.eventstorage.*; +import org.apache.ignite.spi.eventstorage.memory.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.grid.spi.loadbalancing.roundrobin.*; import org.gridgain.grid.spi.swapspace.*; import org.gridgain.grid.spi.swapspace.file.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java index 52465fd..be6065b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java @@ -20,8 +20,8 @@ import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java index 14e38cf..56b19e8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java @@ -13,8 +13,8 @@ import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java index f03aa0c..2e87587 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java @@ -16,7 +16,7 @@ import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.spi.eventstorage.memory.*; +import org.apache.ignite.spi.eventstorage.memory.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index bd32dd4..5628d11 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -19,7 +19,7 @@ import org.gridgain.grid.cache.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.spi.eventstorage.memory.*; +import org.apache.ignite.spi.eventstorage.memory.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java index 0eb7b79..69bdef7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java @@ -13,7 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.never.*; +import org.apache.ignite.spi.failover.never.*; import org.gridgain.testframework.*; import org.gridgain.testframework.config.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java index f61b906..d558bec 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java @@ -15,7 +15,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.always.*; +import org.apache.ignite.spi.failover.always.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java deleted file mode 100644 index 5ab8dfd..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.eventstorage.memory; - -import org.apache.ignite.events.*; -import org.gridgain.grid.util.typedef.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.spi.*; -import java.util.*; -import java.util.concurrent.*; - -/** - * Memory event storage load test. - */ -@GridSpiTest(spi = MemoryEventStorageSpi.class, group = "EventStorage SPI") -public class GridMemoryEventStorageMultiThreadedSelfTest extends GridSpiAbstractTest<MemoryEventStorageSpi> { - /** - * @throws Exception If test failed - */ - public void testMultiThreaded() throws Exception { - GridTestUtils.runMultiThreaded(new Callable<Object>() { - @Override public Object call() throws Exception { - for (int i = 0; i < 100000; i++) - getSpi().record(new IgniteDiscoveryEvent(null, "Test event", 1, null)); - - return null; - } - }, 10, "event-thread"); - - Collection<IgniteEvent> evts = getSpi().localEvents(F.<IgniteEvent>alwaysTrue()); - - info("Events count in memory: " + evts.size()); - - assert evts.size() <= 10000 : "Incorrect number of events: " + evts.size(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java deleted file mode 100644 index dd4ffb2..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.eventstorage.memory; - -import org.gridgain.testframework.junits.spi.*; - -/** - * Memory event storage SPI config test. - */ -@GridSpiTest(spi = MemoryEventStorageSpi.class, group = "Event Storage SPI") -public class GridMemoryEventStorageSpiConfigSelfTest extends GridSpiAbstractConfigTest<MemoryEventStorageSpi> { - /** - * @throws Exception If failed. - */ - public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new MemoryEventStorageSpi(), "expireCount", 0); - checkNegativeSpiProperty(new MemoryEventStorageSpi(), "expireAgeMs", 0); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java deleted file mode 100644 index 97b5833..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java +++ /dev/null @@ -1,130 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.eventstorage.memory; - -import org.apache.ignite.events.*; -import org.apache.ignite.lang.*; -import org.gridgain.grid.util.typedef.*; -import org.gridgain.testframework.junits.spi.*; - -import java.util.*; - -import static org.apache.ignite.events.IgniteEventType.*; - -/** - * Tests for {@link MemoryEventStorageSpi}. - */ -@GridSpiTest(spi = MemoryEventStorageSpi.class, group = "Event Storage SPI") -public class GridMemoryEventStorageSpiSelfTest extends GridSpiAbstractTest<MemoryEventStorageSpi> { - /** */ - private static final int EXPIRE_CNT = 100; - - /** - * @return Maximum events queue size. - */ - @GridSpiTestConfig - public long getExpireCount() { - return EXPIRE_CNT; - } - - /** - * @return Events expiration time. - */ - @GridSpiTestConfig - public long getExpireAgeMs() { - return 1000; - } - - /** - * @throws Exception If failed. - */ - public void testMemoryEventStorage() throws Exception { - MemoryEventStorageSpi spi = getSpi(); - - IgnitePredicate<IgniteEvent> filter = F.alwaysTrue(); - - // Get all events. - Collection<IgniteEvent> evts = spi.localEvents(filter); - - // Check. - assert evts != null : "Events can't be null."; - assert evts.isEmpty() : "Invalid events count."; - - // Store. - spi.record(createEvent()); - - // Get all events. - evts = spi.localEvents(filter); - - // Check stored events. - assert evts != null : "Events can't be null."; - assert evts.size() == 1 : "Invalid events count."; - - // Sleep a bit more than expire age configuration property. - Thread.sleep(getExpireAgeMs() * 2); - - // Get all events. - evts = spi.localEvents(filter); - - // Check expired by age. - assert evts != null : "Events can't be null."; - assert evts.isEmpty() : "Invalid events count."; - - // Clear. - spi.clearAll(); - - // Get all events. - evts = spi.localEvents(filter); - - // Check events cleared. - assert evts != null : "Events can't be null."; - assert evts.isEmpty() : "Invalid events count."; - } - - /** - * @throws Exception If failed. - */ - @SuppressWarnings({"NullableProblems"}) - public void testFilter() throws Exception { - MemoryEventStorageSpi spi = getSpi(); - - try { - spi.clearAll(); - - spi.setFilter(F.<IgniteEvent>alwaysFalse()); - - // This event should not record. - spi.record(createEvent()); - - spi.setFilter(null); - - spi.record(createEvent()); - - // Get all events. - Collection<IgniteEvent> evts = spi.localEvents(F.<IgniteEvent>alwaysTrue()); - - assert evts != null : "Events can't be null."; - assert evts.size() == 1 : "Invalid events count: " + evts.size(); - } - finally { - if (spi != null) - spi.clearAll(); - } - } - - /** - * @return Discovery event. - * @throws Exception If error occurred. - */ - private IgniteEvent createEvent() throws Exception { - return new IgniteDiscoveryEvent(null, "Test Event", EVT_NODE_METRICS_UPDATED, null); - } -} - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java deleted file mode 100644 index 5f5d05d..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java +++ /dev/null @@ -1,21 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.eventstorage.memory; - -import org.gridgain.grid.spi.*; -import org.gridgain.testframework.junits.spi.*; - -/** - * Memory event storage SPI start-stop test. - */ -@GridSpiTest(spi = MemoryEventStorageSpi.class, group = "Event Storage SPI") -public class GridMemoryEventStorageSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<MemoryEventStorageSpi> { - // No-op. -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/package.html b/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/package.html deleted file mode 100644 index 5cad80a..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/eventstorage/memory/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains internal tests or test related classes and interfaces. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/GridFailoverTestContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/GridFailoverTestContext.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/GridFailoverTestContext.java deleted file mode 100644 index d89a7e8..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/GridFailoverTestContext.java +++ /dev/null @@ -1,62 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover; - -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.gridgain.grid.*; - -import java.util.*; - -/** - * Failover test context. - */ -public class GridFailoverTestContext implements FailoverContext { - /** */ - private static final Random RAND = new Random(); - - /** Grid task session. */ - private final ComputeTaskSession taskSes; - - /** Failed job result. */ - private final ComputeJobResult jobRes; - - /** */ - public GridFailoverTestContext() { - taskSes = null; - jobRes = null; - } - - /** - * Initializes failover context. - * - * @param taskSes Grid task session. - * @param jobRes Failed job result. - */ - public GridFailoverTestContext(ComputeTaskSession taskSes, ComputeJobResult jobRes) { - this.taskSes = taskSes; - this.jobRes = jobRes; - } - - /** {@inheritDoc} */ - @Override public ComputeTaskSession getTaskSession() { - return taskSes; - } - - /** {@inheritDoc} */ - @Override public ComputeJobResult getJobResult() { - return jobRes; - } - - /** {@inheritDoc} */ - @Override public ClusterNode getBalancedNode(List<ClusterNode> grid) throws GridException { - return grid.get(RAND.nextInt(grid.size())); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java deleted file mode 100644 index 79d5946..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.always; - -import org.gridgain.testframework.junits.spi.*; - -/** - * Always-failover SPI config test. - */ -@GridSpiTest(spi = AlwaysFailoverSpi.class, group = "Collision SPI") -public class GridAlwaysFailoverSpiConfigSelfTest extends GridSpiAbstractConfigTest<AlwaysFailoverSpi> { - /** - * @throws Exception If failed. - */ - public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new AlwaysFailoverSpi(), "maximumFailoverAttempts", -1); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java deleted file mode 100644 index f8df7b2..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java +++ /dev/null @@ -1,110 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.always; - -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.spi.*; - -import java.util.*; - -import static org.gridgain.grid.spi.failover.always.AlwaysFailoverSpi.*; - -/** - * Always-failover SPI test. - */ -@GridSpiTest(spi = AlwaysFailoverSpi.class, group = "Failover SPI") -public class GridAlwaysFailoverSpiSelfTest extends GridSpiAbstractTest<AlwaysFailoverSpi> { - /** - * @throws Exception If failed. - */ - public void testSingleNode() throws Exception { - AlwaysFailoverSpi spi = getSpi(); - - List<ClusterNode> nodes = new ArrayList<>(); - - ClusterNode node = new GridTestNode(UUID.randomUUID()); - - nodes.add(node); - - node = spi.failover(new GridFailoverTestContext(new GridTestTaskSession(), new GridTestJobResult(node)), nodes); - - assert node == null; - } - - /** - * @throws Exception If test failed. - */ - @SuppressWarnings("unchecked") - public void testTwoNodes() throws Exception { - AlwaysFailoverSpi spi = getSpi(); - - List<ClusterNode> nodes = new ArrayList<>(); - - nodes.add(new GridTestNode(UUID.randomUUID())); - nodes.add(new GridTestNode(UUID.randomUUID())); - - ComputeJobResult jobRes = new GridTestJobResult(nodes.get(0)); - - ClusterNode node = spi.failover(new GridFailoverTestContext(new GridTestTaskSession(), jobRes), nodes); - - assert node != null; - assert node.equals(nodes.get(1)); - - checkFailedNodes(jobRes, 1); - } - - /** - * @throws Exception If failed. - */ - public void testMaxAttempts() throws Exception { - AlwaysFailoverSpi spi = getSpi(); - - spi.setMaximumFailoverAttempts(1); - - List<ClusterNode> nodes = new ArrayList<>(); - - nodes.add(new GridTestNode(UUID.randomUUID())); - nodes.add(new GridTestNode(UUID.randomUUID())); - - ComputeJobResult jobRes = new GridTestJobResult(nodes.get(0)); - - // First attempt. - ClusterNode node = spi.failover(new GridFailoverTestContext(new GridTestTaskSession(), jobRes), nodes); - - assert node != null; - assert node.equals(nodes.get(1)); - - checkFailedNodes(jobRes, 1); - - // Second attempt (exceeds default max attempts of 1). - node = spi.failover(new GridFailoverTestContext(new GridTestTaskSession(), jobRes), nodes); - - assert node == null; - - checkFailedNodes(jobRes, 1); - } - - /** - * @param res Job result. - * @param cnt Failure count. - */ - @SuppressWarnings("unchecked") - private void checkFailedNodes(ComputeJobResult res, int cnt) { - Collection<UUID> failedNodes = - (Collection<UUID>)res.getJobContext().getAttribute(FAILED_NODE_LIST_ATTR); - - assert failedNodes != null; - assert failedNodes.size() == cnt; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java deleted file mode 100644 index b675067..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java +++ /dev/null @@ -1,22 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.always; - -import org.gridgain.grid.spi.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.testframework.junits.spi.*; - -/** - * Always-failover SPI start-stop test. - */ -@GridSpiTest(spi = AlwaysFailoverSpi.class, group = "Failover SPI") -public class GridAlwaysFailoverSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<FailoverSpi> { - // No-op. -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/package.html b/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/package.html deleted file mode 100644 index 5cad80a..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/always/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains internal tests or test related classes and interfaces. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java deleted file mode 100644 index 9935dde..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.jobstealing; - -import org.gridgain.testframework.junits.spi.*; - -/** - * Job stealing failover SPI config test. - */ -@GridSpiTest(spi = JobStealingFailoverSpi.class, group = "Collision SPI") -public class GridJobStealingFailoverSpiConfigSelfTest extends GridSpiAbstractConfigTest<JobStealingFailoverSpi> { - /** - * @throws Exception If failed. - */ - public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new JobStealingFailoverSpi(), "maximumFailoverAttempts", -1); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java deleted file mode 100644 index 347a00d..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiOneNodeSelfTest.java +++ /dev/null @@ -1,88 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.jobstealing; - -import org.apache.ignite.cluster.*; -import org.gridgain.grid.*; -import org.gridgain.grid.kernal.*; -import org.apache.ignite.spi.collision.jobstealing.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.spi.*; - -import java.util.*; - -/** - * Job stealing failover SPI test for one node. - */ -@GridSpiTest(spi = JobStealingFailoverSpi.class, group = "Failover SPI") -public class GridJobStealingFailoverSpiOneNodeSelfTest extends GridSpiAbstractTest<JobStealingFailoverSpi> { - /** {@inheritDoc} */ - @Override protected GridSpiTestContext initSpiContext() throws Exception { - GridSpiTestContext ctx = super.initSpiContext(); - - ctx.setLocalNode(addSpiDependency(new GridTestNode(UUID.randomUUID()))); - - ctx.addNode(addSpiDependency(new GridTestNode(UUID.randomUUID()))); - - return ctx; - } - - /** - * Adds Collision SPI attribute. - * - * @param node Node to add attribute to. - * @return Passed in node. - * @throws Exception If failed. - */ - private ClusterNode addSpiDependency(GridTestNode node) throws Exception { - node.addAttribute( - U.spiAttribute(getSpi(), GridNodeAttributes.ATTR_SPI_CLASS), - JobStealingCollisionSpi.class.getName()); - - node.addAttribute( - U.spiAttribute(getSpi(), GridNodeAttributes.ATTR_SPI_CLASS), - JobStealingCollisionSpi.class.getName()); - - return node; - } - - /** - * @throws Exception If test failed. - */ - public void testFailover() throws Exception { - ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - failed.getJobContext().setAttribute(JobStealingCollisionSpi.THIEF_NODE_ATTR, - getSpiContext().localNode().id()); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - Collections.singletonList(getSpiContext().remoteNodes().iterator().next())); - - assert other == rmt : "Invalid failed-over node: " + other; - } - - /** - * @throws Exception If test failed. - */ - public void testNoFailover() throws Exception { - ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - Collections.singletonList(getSpiContext().remoteNodes().iterator().next())); - - assert other == null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java deleted file mode 100644 index e2c1b4f..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiSelfTest.java +++ /dev/null @@ -1,217 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.jobstealing; - -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.gridgain.grid.*; -import org.apache.ignite.spi.collision.jobstealing.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.spi.*; - -import java.util.*; - -import static org.gridgain.grid.kernal.GridNodeAttributes.*; -import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi.*; -import static org.gridgain.grid.spi.failover.jobstealing.JobStealingFailoverSpi.*; - -/** - * Self test for {@link JobStealingFailoverSpi} SPI. - */ -@GridSpiTest(spi = JobStealingFailoverSpi.class, group = "Failover SPI") -public class GridJobStealingFailoverSpiSelfTest extends GridSpiAbstractTest<JobStealingFailoverSpi> { - /** {@inheritDoc} */ - @Override protected GridSpiTestContext initSpiContext() throws Exception { - GridSpiTestContext ctx = super.initSpiContext(); - - GridTestNode loc = new GridTestNode(UUID.randomUUID()); - - addSpiDependency(loc); - - ctx.setLocalNode(loc); - - GridTestNode rmt = new GridTestNode(UUID.randomUUID()); - - ctx.addNode(rmt); - - addSpiDependency(rmt); - - return ctx; - } - - /** - * Adds Collision SPI attribute. - * - * @param node Node to add attribute to. - * @throws Exception If failed. - */ - private void addSpiDependency(GridTestNode node) throws Exception { - node.addAttribute(ATTR_SPI_CLASS, JobStealingCollisionSpi.class.getName()); - - node.setAttribute(U.spiAttribute(getSpi(), ATTR_SPI_CLASS), getSpi().getClass().getName()); - } - - /** - * @throws Exception If test failed. - */ - public void testFailover() throws Exception { - ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - failed.getJobContext().setAttribute(THIEF_NODE_ATTR, - getSpiContext().localNode().id()); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - new ArrayList<>(getSpiContext().nodes())); - - assert other == getSpiContext().localNode(); - - // This is not a failover but stealing. - checkAttributes(failed.getJobContext(), null, 0); - } - - /** - * @throws Exception If test failed. - */ - public void testMaxHopsExceeded() throws Exception { - ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - failed.getJobContext().setAttribute(THIEF_NODE_ATTR, - getSpiContext().localNode().id()); - failed.getJobContext().setAttribute(FAILOVER_ATTEMPT_COUNT_ATTR, - getSpi().getMaximumFailoverAttempts()); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - new ArrayList<>(getSpiContext().nodes())); - - assert other == null; - } - - /** - * @throws Exception If test failed. - */ - public void testMaxHopsExceededThiefNotSet() throws Exception { - ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - failed.getJobContext().setAttribute(FAILOVER_ATTEMPT_COUNT_ATTR, - getSpi().getMaximumFailoverAttempts()); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - new ArrayList<>(getSpiContext().nodes())); - - assert other == null; - } - - /** - * @throws Exception If test failed. - */ - public void testNonZeroFailoverCount() throws Exception { - ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - failed.getJobContext().setAttribute(FAILOVER_ATTEMPT_COUNT_ATTR, - getSpi().getMaximumFailoverAttempts() - 1); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - new ArrayList<>(getSpiContext().nodes())); - - assert other != null; - assert other != rmt; - - assert other == getSpiContext().localNode(); - - checkAttributes(failed.getJobContext(), rmt, getSpi().getMaximumFailoverAttempts()); - } - - /** - * @throws Exception If test failed. - */ - public void testThiefNotInTopology() throws Exception { - ClusterNode rmt = new GridTestNode(UUID.randomUUID()); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - failed.getJobContext().setAttribute(THIEF_NODE_ATTR, rmt.id()); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - new ArrayList<>(getSpiContext().nodes())); - - assert other != null; - assert other != rmt; - - assert getSpiContext().nodes().contains(other); - - checkAttributes(failed.getJobContext(), rmt, 1); - } - - /** - * @throws Exception If test failed. - */ - public void testThiefEqualsVictim() throws Exception { - ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - failed.getJobContext().setAttribute(THIEF_NODE_ATTR, rmt.id()); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - new ArrayList<>(getSpiContext().nodes())); - - assert other != null; - assert other != rmt; - - assert other.equals(getSpiContext().localNode()); - - checkAttributes(failed.getJobContext(), rmt, 1); - } - - /** - * @throws Exception If test failed. - */ - public void testThiefIdNotSet() throws Exception { - ClusterNode rmt = getSpiContext().remoteNodes().iterator().next(); - - GridTestJobResult failed = new GridTestJobResult(rmt); - - ClusterNode other = getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), failed), - new ArrayList<>(getSpiContext().nodes())); - - assert other != null; - assert other != rmt; - - assert other.equals(getSpiContext().localNode()); - - checkAttributes(failed.getJobContext(), rmt, 1); - } - - /** - * @param ctx Failed job context. - * @param failed Failed node. - * @param failCnt Failover count. - */ - @SuppressWarnings("unchecked") - private void checkAttributes(ComputeJobContext ctx, ClusterNode failed, int failCnt) { - assert (Integer)ctx.getAttribute(FAILOVER_ATTEMPT_COUNT_ATTR) == failCnt; - - if (failed != null) { - Collection<UUID> failedSet = (Collection<UUID>)ctx.getAttribute(FAILED_NODE_LIST_ATTR); - - assert failedSet.contains(failed.id()); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java deleted file mode 100644 index 871fbb7..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpiStartStopSelfTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.jobstealing; - -import org.gridgain.grid.kernal.*; -import org.gridgain.grid.spi.*; -import org.apache.ignite.spi.collision.jobstealing.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.spi.*; -import java.util.*; - -/** - * Job stealing failover SPI start-stop test. - */ -@GridSpiTest(spi = JobStealingFailoverSpi.class, group = "Failover SPI") -public class GridJobStealingFailoverSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<FailoverSpi> { - /** {@inheritDoc} */ - @Override protected GridSpiTestContext initSpiContext() throws Exception { - GridSpiTestContext ctx = super.initSpiContext(); - - GridTestNode locNode = new GridTestNode(UUID.randomUUID()); - - addSpiDependency(locNode); - - ctx.setLocalNode(locNode); - - return ctx; - } - - /** - * Adds Failover SPI attribute. - * - * @param node Node to add attribute to. - */ - private void addSpiDependency(GridTestNode node) { - node.addAttribute(GridNodeAttributes.ATTR_SPI_CLASS, JobStealingCollisionSpi.class.getName()); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/package.html b/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/package.html deleted file mode 100644 index 5cad80a..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/jobstealing/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains internal tests or test related classes and interfaces. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpiSelfTest.java deleted file mode 100644 index 089d25e..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpiSelfTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.never; - -import org.apache.ignite.cluster.*; -import org.gridgain.grid.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.spi.*; -import java.util.*; - -/** - * Never failover SPI test. - */ -@GridSpiTest(spi = NeverFailoverSpi.class, group = "Failover SPI") -public class GridNeverFailoverSpiSelfTest extends GridSpiAbstractTest<NeverFailoverSpi> { - /** - * @throws Exception If failed. - */ - public void testAlwaysNull() throws Exception { - List<ClusterNode> nodes = new ArrayList<>(); - - ClusterNode node = new GridTestNode(UUID.randomUUID()); - - nodes.add(node); - - assert getSpi().failover(new GridFailoverTestContext(new GridTestTaskSession(), new GridTestJobResult(node)), - nodes) == null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpiStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpiStartStopSelfTest.java deleted file mode 100644 index f7063d8..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpiStartStopSelfTest.java +++ /dev/null @@ -1,22 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.failover.never; - -import org.gridgain.grid.spi.*; -import org.gridgain.grid.spi.failover.*; -import org.gridgain.testframework.junits.spi.*; - -/** - * Never-failover SPI start-stop test. - */ -@GridSpiTest(spi = NeverFailoverSpi.class, group = "Failover SPI") -public class GridNeverFailoverSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<FailoverSpi> { - // No-op. -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/package.html b/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/package.html deleted file mode 100644 index 5cad80a..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/never/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains internal tests or test related classes and interfaces. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/grid/spi/failover/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/failover/package.html b/modules/core/src/test/java/org/gridgain/grid/spi/failover/package.html deleted file mode 100644 index 5cad80a..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/spi/failover/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains internal tests or test related classes and interfaces. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java index 630f959..8340e9c 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java @@ -16,7 +16,7 @@ import org.gridgain.grid.loadtest.*; import org.apache.ignite.spi.collision.jobstealing.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; -import org.gridgain.grid.spi.failover.jobstealing.*; +import org.apache.ignite.spi.failover.jobstealing.*; import org.gridgain.testframework.*; import org.gridgain.testframework.config.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/testsuites/GridSpiEventStorageSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridSpiEventStorageSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridSpiEventStorageSelfTestSuite.java index 38add54..9b09a6a 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridSpiEventStorageSelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridSpiEventStorageSelfTestSuite.java @@ -10,7 +10,7 @@ package org.gridgain.testsuites; import junit.framework.*; -import org.gridgain.grid.spi.eventstorage.memory.*; +import org.apache.ignite.spi.eventstorage.memory.*; /** * Event storage test suite. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/725526fa/modules/core/src/test/java/org/gridgain/testsuites/GridSpiFailoverSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridSpiFailoverSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridSpiFailoverSelfTestSuite.java index 4c6a13f..2193839 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridSpiFailoverSelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridSpiFailoverSelfTestSuite.java @@ -10,9 +10,9 @@ package org.gridgain.testsuites; import junit.framework.*; -import org.gridgain.grid.spi.failover.always.*; -import org.gridgain.grid.spi.failover.jobstealing.*; -import org.gridgain.grid.spi.failover.never.*; +import org.apache.ignite.spi.failover.always.*; +import org.apache.ignite.spi.failover.jobstealing.*; +import org.apache.ignite.spi.failover.never.*; /** * Failover SPI self-test suite.
