You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/30 14:38:17 UTC
[3/9] ignite git commit: IGNITE-4838 Fixed internal task detection
logic. Added tests.
IGNITE-4838 Fixed internal task detection logic. Added tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba68c6ca
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba68c6ca
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba68c6ca
Branch: refs/heads/ignite-4003
Commit: ba68c6cae674aa6b2d76035b376fcbdf5c4a2f64
Parents: 8dd88d8
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Thu Mar 30 11:08:10 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Mar 30 11:08:10 2017 +0700
----------------------------------------------------------------------
.../processors/task/GridTaskProcessor.java | 9 +++++-
.../internal/GridTaskExecutionSelfTest.java | 34 ++++++++++++++++++++
...xecutionWithoutPeerClassLoadingSelfTest.java | 31 ++++++++++++++++++
.../testsuites/IgniteComputeGridTestSuite.java | 2 ++
4 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba68c6ca/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 9a98aeb..a11eabc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -608,6 +608,13 @@ public class GridTaskProcessor extends GridProcessorAdapter {
if (subjId == null)
subjId = ctx.localNodeId();
+ boolean internal = false;
+
+ if (dep == null || taskCls == null)
+ assert deployEx != null;
+ else
+ internal = dep.internalTask(task, taskCls);
+
// Creates task session with task name and task version.
GridTaskSessionImpl ses = ctx.session().createTaskSession(
sesId,
@@ -621,7 +628,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
Collections.<ComputeJobSibling>emptyList(),
Collections.emptyMap(),
fullSup,
- dep != null && dep.internalTask(task, taskCls),
+ internal,
subjId);
ComputeTaskInternalFuture<R> fut = new ComputeTaskInternalFuture<>(ses, ctx);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba68c6ca/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
index a98c578..e533a70 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
@@ -22,8 +22,10 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.GridTestTask;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteDeploymentException;
import org.apache.ignite.compute.ComputeJobContext;
import org.apache.ignite.compute.ComputeTaskFuture;
+import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteFuture;
@@ -45,6 +47,20 @@ public class GridTaskExecutionSelfTest extends GridCommonAbstractTest {
super(false);
}
+ /** */
+ protected boolean peerClassLoadingEnabled() {
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ cfg.setPeerClassLoadingEnabled(peerClassLoadingEnabled());
+
+ return cfg;
+ }
+
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
startGrid(1);
@@ -136,4 +152,22 @@ public class GridTaskExecutionSelfTest extends GridCommonAbstractTest {
for (IgniteFuture<Object> fut : futs)
fut.get();
}
+
+ /**
+ * Test execution of non-existing task by name IGNITE-4838.
+ *
+ * @throws Exception If failed.
+ */
+ public void testExecuteTaskWithInvalidName() throws Exception {
+ try {
+ ComputeTaskFuture<?> fut = ignite.compute().execute("invalid.task.name", null);
+
+ fut.get();
+
+ assert false : "Should never be reached due to exception thrown.";
+ }
+ catch (IgniteDeploymentException e) {
+ info("Received correct exception: " + e);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba68c6ca/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionWithoutPeerClassLoadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionWithoutPeerClassLoadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionWithoutPeerClassLoadingSelfTest.java
new file mode 100644
index 0000000..45e65cd
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionWithoutPeerClassLoadingSelfTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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 org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+/**
+ * Task execution test.
+ */
+@GridCommonTest(group = "Kernal Self")
+public class GridTaskExecutionWithoutPeerClassLoadingSelfTest extends GridTaskExecutionSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean peerClassLoadingEnabled() {
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba68c6ca/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index 66238d9..810c488 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -52,6 +52,7 @@ import org.apache.ignite.internal.GridProjectionLocalJobMultipleArgumentsSelfTes
import org.apache.ignite.internal.GridStopWithWaitSelfTest;
import org.apache.ignite.internal.GridTaskCancelSingleNodeSelfTest;
import org.apache.ignite.internal.GridTaskExecutionSelfTest;
+import org.apache.ignite.internal.GridTaskExecutionWithoutPeerClassLoadingSelfTest;
import org.apache.ignite.internal.GridTaskFailoverAffinityRunTest;
import org.apache.ignite.internal.GridTaskFailoverSelfTest;
import org.apache.ignite.internal.GridTaskFutureImplStopGridSelfTest;
@@ -102,6 +103,7 @@ public class IgniteComputeGridTestSuite {
suite.addTestSuite(GridCancelUnusedJobSelfTest.class);
suite.addTestSuite(GridTaskJobRejectSelfTest.class);
suite.addTestSuite(GridTaskExecutionSelfTest.class);
+ suite.addTestSuite(GridTaskExecutionWithoutPeerClassLoadingSelfTest.class);
suite.addTestSuite(GridFailoverSelfTest.class);
suite.addTestSuite(GridTaskListenerSelfTest.class);
suite.addTestSuite(GridFailoverTopologySelfTest.class);