Repository: ignite Updated Branches: refs/heads/ignite-2849 dd7f5d6e5 -> 4846b21f5
IGNITE-2853 - Fixed cancellation of the job that depends on a service Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d3420e6b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d3420e6b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d3420e6b Branch: refs/heads/ignite-2849 Commit: d3420e6bc5e833a6eb1daaad25b11843f97328d5 Parents: 69d1f4b Author: Valentin Kulichenko <[email protected]> Authored: Wed Mar 16 22:21:24 2016 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Wed Mar 16 22:21:24 2016 -0700 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../ComputeJobCancelWithServiceSelfTest.java | 154 +++++++++++++++++++ .../testsuites/IgniteKernalSelfTestSuite.java | 2 + 3 files changed, 157 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d3420e6b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 5d8daf6..8df89f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -849,6 +849,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { startProcessor(createComponent(IgniteCacheObjectProcessor.class, ctx)); startProcessor(new GridCacheProcessor(ctx)); startProcessor(new GridQueryProcessor(ctx)); + startProcessor(new GridServiceProcessor(ctx)); startProcessor(new GridTaskSessionProcessor(ctx)); startProcessor(new GridJobProcessor(ctx)); startProcessor(new GridTaskProcessor(ctx)); @@ -860,7 +861,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { startProcessor((GridProcessor)(cfg.isPeerClassLoadingEnabled() ? IgniteComponentType.HADOOP.create(ctx, true): // No-op when peer class loading is enabled. IgniteComponentType.HADOOP.createIfInClassPath(ctx, cfg.getHadoopConfiguration() != null))); - startProcessor(new GridServiceProcessor(ctx)); startProcessor(new DataStructuresProcessor(ctx)); startProcessor(createComponent(PlatformProcessor.class, ctx)); http://git-wip-us.apache.org/repos/asf/ignite/blob/d3420e6b/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java new file mode 100644 index 0000000..2718ed9 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java @@ -0,0 +1,154 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCompute; +import org.apache.ignite.IgniteException; +import org.apache.ignite.Ignition; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskFuture; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.services.Service; +import org.apache.ignite.services.ServiceContext; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +/** + * Test cancellation of a job that depends on service. + */ +public class ComputeJobCancelWithServiceSelfTest extends GridCommonAbstractTest { + /** */ + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + } + + /** + * @throws Exception If failed. + */ + public void testJobCancel() throws Exception { + Ignite server = startGrid("server"); + + server.services().deployNodeSingleton("my-service", new MyService()); + + Ignition.setClientMode(true); + + Ignite client = startGrid("client"); + + IgniteCompute compute = client.compute().withAsync(); + + compute.execute(new MyTask(), null); + + ComputeTaskFuture<Integer> fut = compute.future(); + + Thread.sleep(3000); + + server.close(); + + assertEquals(42, fut.get().intValue()); + } + + /** */ + private static class MyService implements Service { + /** */ + private volatile boolean cancelled; + + /** {@inheritDoc} */ + @Override public void init(ServiceContext ctx) throws Exception { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void execute(ServiceContext ctx) throws Exception { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void cancel(ServiceContext ctx) { + cancelled = true; + } + + /** + * @return Response. + */ + public int hello() { + assertFalse("Service already cancelled!", cancelled); + + return 42; + } + } + + /** */ + private static class MyTask extends ComputeTaskSplitAdapter<Object, Integer> { + /** {@inheritDoc} */ + @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) { + return Collections.singletonList(new ComputeJobAdapter() { + @IgniteInstanceResource + private Ignite ignite; + + @Override + public Object execute() throws IgniteException { + MyService svc = ignite.services().service("my-service"); + + while (!isCancelled()) { + try { + Thread.sleep(1000); + + svc.hello(); + } + catch (InterruptedException e) { + // No-op. + } + } + + assertTrue(isCancelled()); + + return svc.hello(); + } + }); + } + + /** {@inheritDoc} */ + @Override public Integer reduce(List<ComputeJobResult> results) { + assertEquals(1, results.size()); + + return results.get(0).getData(); + } + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/d3420e6b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java index 6233bab..a8d6e5c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java @@ -19,6 +19,7 @@ package org.apache.ignite.testsuites; import java.util.Set; import junit.framework.TestSuite; +import org.apache.ignite.internal.ComputeJobCancelWithServiceSelfTest; import org.apache.ignite.internal.GridCommunicationSelfTest; import org.apache.ignite.internal.GridDiscoveryEventSelfTest; import org.apache.ignite.internal.GridDiscoverySelfTest; @@ -114,6 +115,7 @@ public class IgniteKernalSelfTestSuite extends TestSuite { suite.addTestSuite(IgniteUpdateNotifierPerClusterSettingSelfTest.class); suite.addTestSuite(GridLocalEventListenerSelfTest.class); suite.addTestSuite(IgniteTopologyPrintFormatSelfTest.class); + suite.addTestSuite(ComputeJobCancelWithServiceSelfTest.class); // Managed Services. suite.addTestSuite(GridServiceProcessorSingleNodeSelfTest.class);
