alex-plekhanov commented on code in PR #12760:
URL: https://github.com/apache/ignite/pull/12760#discussion_r2826341664
##########
modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java:
##########
@@ -63,6 +63,9 @@ class GridDeploymentLocalStore extends
GridDeploymentStoreAdapter {
/** Deployment cache by class name. */
private final ConcurrentMap<String, Deque<GridDeployment>> cache = new
ConcurrentHashMap<>();
+ /** Deployment cache by classloader. */
+ private final ConcurrentMap<ClassLoader, Deque<GridDeployment>> cacheByLdr
= new ConcurrentHashMap<>();
Review Comment:
cacheByLdr always used under the lock `mux`, no ConcurrentMap overhead
required here.
Also maybe it worth to use IdentityHashMap in case someone redefine
classloader's `equals()` in a wrong way.
##########
modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java:
##########
@@ -391,13 +391,16 @@ private GridDeployment checkDeployment(GridDeployment
deployment, String store)
String clsName = lambdaEnclosingClsName == null ? rsrcName :
lambdaEnclosingClsName;
+ ClassLoader ldr = Thread.currentThread().getContextClassLoader();
+
GridDeploymentMetadata meta = new GridDeploymentMetadata();
meta.record(true);
meta.deploymentMode(ctx.config().getDeploymentMode());
meta.alias(rsrcName);
meta.className(clsName);
meta.senderNodeId(ctx.localNodeId());
+ meta.classLoader(ldr);
Review Comment:
Setting classloader disables deployment SPI as far as I understand. See
https://github.com/apache/ignite/blob/master/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java#L174
##########
modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStoreReuseTest.java:
##########
@@ -0,0 +1,177 @@
+/*
+ * 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.managers.deployment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.stream.Collectors;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.ThinClientConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.thin.AbstractThinClientTest;
+import org.apache.ignite.internal.client.thin.TestTask;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.testframework.ListeningTestLogger;
+import org.junit.Test;
+
+import static org.apache.ignite.testframework.GridTestUtils.runAsync;
+import static org.apache.ignite.testframework.GridTestUtils.waitForAllFutures;
+
+/** */
+public class GridDeploymentLocalStoreReuseTest extends AbstractThinClientTest {
+ /** */
+ private static final int NODE_CNT = 3;
+
+ /** */
+ private static final int CLIENT_CNT = 3;
+
+ /** */
+ protected static final int EXEC_CNT = 10;
+
+ /** */
+ private List<DeploymentListeningLogger> logs;
+
+ /** */
+ private List<IgniteClient> clients;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ DeploymentListeningLogger testLog = new DeploymentListeningLogger(log);
+ logs.add(testLog);
+
+ return super.getConfiguration(igniteInstanceName)
+ .setClientConnectorConfiguration(
+ new ClientConnectorConfiguration().setThinClientConfiguration(
+ new
ThinClientConfiguration().setMaxActiveComputeTasksPerConnection(1000)))
+ .setGridLogger(testLog)
+ .setPeerClassLoadingEnabled(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
+ logs = new ArrayList<>(NODE_CNT);
+
+ clients = new ArrayList<>(CLIENT_CNT);
+
+ setLoggerDebugLevel();
+
+ startGrids(NODE_CNT);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ clients.clear();
+
+ super.afterTest();
+ }
+
+ /**
+ * Verifies that multiple task executions do not cause excessive local
deployment cache misses. The "deployment not
+ * found ... clsLdrId=null" message is allowed only once per thin client
(initial task execution).
+ */
+ @Test
+ public void testNoExcessiveLocalDeployment() {
+ try {
+ ClusterNode[] allServerNodes =
grid(0).cluster().forServers().nodes().toArray(new ClusterNode[0]);
+
+ for (int i = 0; i < CLIENT_CNT; i++)
+ clients.add(startClient(allServerNodes));
+
+ List<IgniteInternalFuture<Void>> futs = new
ArrayList<>(CLIENT_CNT);
+
+ for (IgniteClient client : clients)
+ futs.add(runAsync(() -> executeTasksOnClient(client, EXEC_CNT,
5_000L)));
+
+ waitForAllFutures(futs.toArray(new IgniteInternalFuture[0]));
+
+ List<String> allNotFound = new ArrayList<>();
+
+ for (DeploymentListeningLogger log : logs)
+ allNotFound.addAll(log.depNotFound());
+
+ String taskClsName = TestTask.class.getName();
+
+ String notFoundMsg = String.format(
+ "Deployment was not found for class with specific class loader
[alias=%s, clsLdrId=null]", taskClsName);
+
+ assertEquals(CLIENT_CNT, Collections.frequency(allNotFound,
notFoundMsg));
+ }
+ finally {
+ clients.forEach(IgniteClient::close);
+ }
+ }
+
+ /** */
+ private static void executeTasksOnClient(IgniteClient client, int cnt,
long timeout) {
+ for (int i = 0; i < cnt; i++) {
+ CompletableFuture<T2<UUID, Set<UUID>>> fut = client.compute()
+ .withTimeout(timeout).
+ <T2<UUID, Set<UUID>>, T2<UUID,
Set<UUID>>>executeAsync2(TestTask.class.getName(), null)
+ .toCompletableFuture();
+
+ try {
+ fut.get();
+ }
+ catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ /** */
+ private static class DeploymentListeningLogger extends ListeningTestLogger
{
+ /** */
+ private final ConcurrentLinkedQueue<String> depNotFound = new
ConcurrentLinkedQueue<>();
+
+ /** */
+ public DeploymentListeningLogger(IgniteLogger log) {
+ super(log);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void debug(String msg) {
+ if (msg.contains("Deployment was not found for class with specific
class loader"))
+ depNotFound.add(msg);
+
+ super.debug(msg);
+ }
+
+ /** {@inheritDoc} */
+ @Override public ListeningTestLogger getLogger(Object ctgr) {
+ return this;
+ }
+
+ /** */
+ public List<String> depNotFound() {
+ return
depNotFound.stream().collect(Collectors.toUnmodifiableList());
+ }
+ }
+}
Review Comment:
It's incorrect usage of listening logger, all you need is register listener
like:
```
LogListener lsnr =
LogListener.matches(notFoundMsg).times(CLIENT_CNT).build();
listeningTestLog.registerListener(lsnr);
```
listeningTestLog should be created on top of standard logger, for example:
```
setLoggerDebugLevel();
listeningTestLog = new ListeningTestLogger(log);
```
And passed to ignite configuration. No need for logger for each node.
##########
modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java:
##########
@@ -296,23 +299,49 @@ private GridDeployment deploy(
try {
Deque<GridDeployment> cachedDeps = null;
- // Find existing class loader info.
- for (Deque<GridDeployment> deps : cache.values()) {
- for (GridDeployment d : deps) {
- if (d.classLoader() == ldr) {
- // Cache class and alias.
- fireEvt = d.addDeployedClass(cls, alias);
+ Deque<GridDeployment> depsByLdr = cacheByLdr.get(ldr);
- cachedDeps = deps;
+ if (depsByLdr != null) {
+ GridDeployment candidate = null;
- dep = d;
+ for (GridDeployment d : depsByLdr) {
+ if (!d.undeployed() && d.classLoader() == ldr) {
Review Comment:
If it's undeployed, it's cleaned from cache, how we can find it?
Why do we need to check classloader if we put in cache only items with
exactly this classloader?
##########
modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java:
##########
@@ -296,23 +299,49 @@ private GridDeployment deploy(
try {
Deque<GridDeployment> cachedDeps = null;
- // Find existing class loader info.
- for (Deque<GridDeployment> deps : cache.values()) {
- for (GridDeployment d : deps) {
- if (d.classLoader() == ldr) {
- // Cache class and alias.
- fireEvt = d.addDeployedClass(cls, alias);
+ Deque<GridDeployment> depsByLdr = cacheByLdr.get(ldr);
Review Comment:
Looks like it's one-to-one relation for deployment and classloader. Did I
miss something?
##########
modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStoreReuseTest.java:
##########
@@ -0,0 +1,177 @@
+/*
+ * 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.managers.deployment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.stream.Collectors;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.ThinClientConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.thin.AbstractThinClientTest;
+import org.apache.ignite.internal.client.thin.TestTask;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.testframework.ListeningTestLogger;
+import org.junit.Test;
+
+import static org.apache.ignite.testframework.GridTestUtils.runAsync;
+import static org.apache.ignite.testframework.GridTestUtils.waitForAllFutures;
+
+/** */
+public class GridDeploymentLocalStoreReuseTest extends AbstractThinClientTest {
+ /** */
+ private static final int NODE_CNT = 3;
+
+ /** */
+ private static final int CLIENT_CNT = 3;
+
+ /** */
+ protected static final int EXEC_CNT = 10;
+
+ /** */
+ private List<DeploymentListeningLogger> logs;
+
+ /** */
+ private List<IgniteClient> clients;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ DeploymentListeningLogger testLog = new DeploymentListeningLogger(log);
+ logs.add(testLog);
+
+ return super.getConfiguration(igniteInstanceName)
+ .setClientConnectorConfiguration(
+ new ClientConnectorConfiguration().setThinClientConfiguration(
+ new
ThinClientConfiguration().setMaxActiveComputeTasksPerConnection(1000)))
+ .setGridLogger(testLog)
+ .setPeerClassLoadingEnabled(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
+ logs = new ArrayList<>(NODE_CNT);
+
+ clients = new ArrayList<>(CLIENT_CNT);
+
+ setLoggerDebugLevel();
+
+ startGrids(NODE_CNT);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ clients.clear();
+
+ super.afterTest();
+ }
+
+ /**
+ * Verifies that multiple task executions do not cause excessive local
deployment cache misses. The "deployment not
+ * found ... clsLdrId=null" message is allowed only once per thin client
(initial task execution).
+ */
+ @Test
+ public void testNoExcessiveLocalDeployment() {
+ try {
+ ClusterNode[] allServerNodes =
grid(0).cluster().forServers().nodes().toArray(new ClusterNode[0]);
+
+ for (int i = 0; i < CLIENT_CNT; i++)
+ clients.add(startClient(allServerNodes));
Review Comment:
You can connect to any server node,it's not necessary to provide all nodes,
one is enough, i.e. `clients.add(startClient(0));`
##########
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java:
##########
@@ -82,7 +83,8 @@
GridDifferentLocalDeploymentSelfTest.class,
P2PUnsupportedClassVersionTest.class,
P2PClassLoadingFailureHandlingTest.class,
- P2PClassLoadingIssuesTest.class
+ P2PClassLoadingIssuesTest.class,
+ GridDeploymentLocalStoreReuseTest.class
Review Comment:
Add comma to the end of line please (to reduce conflicts on merge)
##########
modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStoreReuseTest.java:
##########
@@ -0,0 +1,177 @@
+/*
+ * 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.managers.deployment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.stream.Collectors;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.ThinClientConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.thin.AbstractThinClientTest;
+import org.apache.ignite.internal.client.thin.TestTask;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.testframework.ListeningTestLogger;
+import org.junit.Test;
+
+import static org.apache.ignite.testframework.GridTestUtils.runAsync;
+import static org.apache.ignite.testframework.GridTestUtils.waitForAllFutures;
+
+/** */
+public class GridDeploymentLocalStoreReuseTest extends AbstractThinClientTest {
+ /** */
+ private static final int NODE_CNT = 3;
+
+ /** */
+ private static final int CLIENT_CNT = 3;
+
+ /** */
+ protected static final int EXEC_CNT = 10;
+
+ /** */
+ private List<DeploymentListeningLogger> logs;
+
+ /** */
+ private List<IgniteClient> clients;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ DeploymentListeningLogger testLog = new DeploymentListeningLogger(log);
+ logs.add(testLog);
+
+ return super.getConfiguration(igniteInstanceName)
+ .setClientConnectorConfiguration(
+ new ClientConnectorConfiguration().setThinClientConfiguration(
+ new
ThinClientConfiguration().setMaxActiveComputeTasksPerConnection(1000)))
+ .setGridLogger(testLog)
+ .setPeerClassLoadingEnabled(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
+ logs = new ArrayList<>(NODE_CNT);
+
+ clients = new ArrayList<>(CLIENT_CNT);
+
+ setLoggerDebugLevel();
+
+ startGrids(NODE_CNT);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ clients.clear();
+
+ super.afterTest();
+ }
+
+ /**
+ * Verifies that multiple task executions do not cause excessive local
deployment cache misses. The "deployment not
+ * found ... clsLdrId=null" message is allowed only once per thin client
(initial task execution).
+ */
+ @Test
+ public void testNoExcessiveLocalDeployment() {
+ try {
+ ClusterNode[] allServerNodes =
grid(0).cluster().forServers().nodes().toArray(new ClusterNode[0]);
+
+ for (int i = 0; i < CLIENT_CNT; i++)
+ clients.add(startClient(allServerNodes));
+
+ List<IgniteInternalFuture<Void>> futs = new
ArrayList<>(CLIENT_CNT);
+
+ for (IgniteClient client : clients)
+ futs.add(runAsync(() -> executeTasksOnClient(client, EXEC_CNT,
5_000L)));
+
+ waitForAllFutures(futs.toArray(new IgniteInternalFuture[0]));
Review Comment:
```
runMultiThreaded(i -> executeTasksOnClient(clients.get(i),
EXEC_CNT), CLIENT_CNT, "worker");
```
##########
modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStoreReuseTest.java:
##########
@@ -0,0 +1,177 @@
+/*
+ * 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.managers.deployment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.stream.Collectors;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.ThinClientConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.thin.AbstractThinClientTest;
+import org.apache.ignite.internal.client.thin.TestTask;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.testframework.ListeningTestLogger;
+import org.junit.Test;
+
+import static org.apache.ignite.testframework.GridTestUtils.runAsync;
+import static org.apache.ignite.testframework.GridTestUtils.waitForAllFutures;
+
+/** */
+public class GridDeploymentLocalStoreReuseTest extends AbstractThinClientTest {
+ /** */
+ private static final int NODE_CNT = 3;
+
+ /** */
+ private static final int CLIENT_CNT = 3;
+
+ /** */
+ protected static final int EXEC_CNT = 10;
+
+ /** */
+ private List<DeploymentListeningLogger> logs;
+
+ /** */
+ private List<IgniteClient> clients;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ DeploymentListeningLogger testLog = new DeploymentListeningLogger(log);
+ logs.add(testLog);
+
+ return super.getConfiguration(igniteInstanceName)
+ .setClientConnectorConfiguration(
+ new ClientConnectorConfiguration().setThinClientConfiguration(
+ new
ThinClientConfiguration().setMaxActiveComputeTasksPerConnection(1000)))
+ .setGridLogger(testLog)
+ .setPeerClassLoadingEnabled(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
+ logs = new ArrayList<>(NODE_CNT);
+
+ clients = new ArrayList<>(CLIENT_CNT);
+
+ setLoggerDebugLevel();
+
+ startGrids(NODE_CNT);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ clients.clear();
+
+ super.afterTest();
+ }
+
+ /**
+ * Verifies that multiple task executions do not cause excessive local
deployment cache misses. The "deployment not
+ * found ... clsLdrId=null" message is allowed only once per thin client
(initial task execution).
+ */
+ @Test
+ public void testNoExcessiveLocalDeployment() {
+ try {
+ ClusterNode[] allServerNodes =
grid(0).cluster().forServers().nodes().toArray(new ClusterNode[0]);
+
+ for (int i = 0; i < CLIENT_CNT; i++)
+ clients.add(startClient(allServerNodes));
+
+ List<IgniteInternalFuture<Void>> futs = new
ArrayList<>(CLIENT_CNT);
+
+ for (IgniteClient client : clients)
+ futs.add(runAsync(() -> executeTasksOnClient(client, EXEC_CNT,
5_000L)));
+
+ waitForAllFutures(futs.toArray(new IgniteInternalFuture[0]));
+
+ List<String> allNotFound = new ArrayList<>();
+
+ for (DeploymentListeningLogger log : logs)
+ allNotFound.addAll(log.depNotFound());
+
+ String taskClsName = TestTask.class.getName();
+
+ String notFoundMsg = String.format(
+ "Deployment was not found for class with specific class loader
[alias=%s, clsLdrId=null]", taskClsName);
+
+ assertEquals(CLIENT_CNT, Collections.frequency(allNotFound,
notFoundMsg));
+ }
+ finally {
+ clients.forEach(IgniteClient::close);
+ }
+ }
+
+ /** */
+ private static void executeTasksOnClient(IgniteClient client, int cnt,
long timeout) {
+ for (int i = 0; i < cnt; i++) {
+ CompletableFuture<T2<UUID, Set<UUID>>> fut = client.compute()
+ .withTimeout(timeout).
+ <T2<UUID, Set<UUID>>, T2<UUID,
Set<UUID>>>executeAsync2(TestTask.class.getName(), null)
+ .toCompletableFuture();
+
+ try {
+ fut.get();
Review Comment:
```
client.compute().execute(TestTask.class.getName(), null);
```
##########
modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java:
##########
@@ -296,23 +299,49 @@ private GridDeployment deploy(
try {
Deque<GridDeployment> cachedDeps = null;
- // Find existing class loader info.
- for (Deque<GridDeployment> deps : cache.values()) {
- for (GridDeployment d : deps) {
- if (d.classLoader() == ldr) {
- // Cache class and alias.
- fireEvt = d.addDeployedClass(cls, alias);
+ Deque<GridDeployment> depsByLdr = cacheByLdr.get(ldr);
- cachedDeps = deps;
+ if (depsByLdr != null) {
+ GridDeployment candidate = null;
- dep = d;
+ for (GridDeployment d : depsByLdr) {
+ if (!d.undeployed() && d.classLoader() == ldr) {
+ candidate = d;
break;
}
}
- if (cachedDeps != null)
- break;
+ if (candidate != null) {
+ fireEvt = candidate.addDeployedClass(cls, alias);
+
+ cachedDeps = depsByLdr;
+
+ dep = candidate;
+ }
+ }
+ else {
Review Comment:
Do we still need this check? If deployment not found by classloader in
classloader cache it can't be found in aliases cache. We preserve both caches
synchronized and modify it only under the lock.
##########
modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStoreReuseTest.java:
##########
@@ -0,0 +1,177 @@
+/*
+ * 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.managers.deployment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.stream.Collectors;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.ThinClientConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.client.thin.AbstractThinClientTest;
+import org.apache.ignite.internal.client.thin.TestTask;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.testframework.ListeningTestLogger;
+import org.junit.Test;
+
+import static org.apache.ignite.testframework.GridTestUtils.runAsync;
+import static org.apache.ignite.testframework.GridTestUtils.waitForAllFutures;
+
+/** */
+public class GridDeploymentLocalStoreReuseTest extends AbstractThinClientTest {
+ /** */
+ private static final int NODE_CNT = 3;
+
+ /** */
+ private static final int CLIENT_CNT = 3;
+
+ /** */
+ protected static final int EXEC_CNT = 10;
+
+ /** */
+ private List<DeploymentListeningLogger> logs;
+
+ /** */
+ private List<IgniteClient> clients;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ DeploymentListeningLogger testLog = new DeploymentListeningLogger(log);
+ logs.add(testLog);
+
+ return super.getConfiguration(igniteInstanceName)
+ .setClientConnectorConfiguration(
+ new ClientConnectorConfiguration().setThinClientConfiguration(
+ new
ThinClientConfiguration().setMaxActiveComputeTasksPerConnection(1000)))
+ .setGridLogger(testLog)
+ .setPeerClassLoadingEnabled(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
+ logs = new ArrayList<>(NODE_CNT);
+
+ clients = new ArrayList<>(CLIENT_CNT);
+
+ setLoggerDebugLevel();
+
+ startGrids(NODE_CNT);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ clients.clear();
+
+ super.afterTest();
+ }
+
+ /**
+ * Verifies that multiple task executions do not cause excessive local
deployment cache misses. The "deployment not
+ * found ... clsLdrId=null" message is allowed only once per thin client
(initial task execution).
+ */
+ @Test
+ public void testNoExcessiveLocalDeployment() {
+ try {
+ ClusterNode[] allServerNodes =
grid(0).cluster().forServers().nodes().toArray(new ClusterNode[0]);
+
+ for (int i = 0; i < CLIENT_CNT; i++)
+ clients.add(startClient(allServerNodes));
+
+ List<IgniteInternalFuture<Void>> futs = new
ArrayList<>(CLIENT_CNT);
+
+ for (IgniteClient client : clients)
+ futs.add(runAsync(() -> executeTasksOnClient(client, EXEC_CNT,
5_000L)));
+
+ waitForAllFutures(futs.toArray(new IgniteInternalFuture[0]));
+
+ List<String> allNotFound = new ArrayList<>();
+
+ for (DeploymentListeningLogger log : logs)
+ allNotFound.addAll(log.depNotFound());
+
+ String taskClsName = TestTask.class.getName();
+
+ String notFoundMsg = String.format(
+ "Deployment was not found for class with specific class loader
[alias=%s, clsLdrId=null]", taskClsName);
+
+ assertEquals(CLIENT_CNT, Collections.frequency(allNotFound,
notFoundMsg));
Review Comment:
It's not a correct check. You get CLIENT_CNT occurances here just becouse
clients start tasks concurrently and you enter the same section by different
threads before class was deployed to cluster. In case of any delay test become
flaky. For example, if you add something like
```
clients.get(0).compute().execute(TestTask.class.getName(), null);
doSleep(1000);
```
Before massive client tasks start, you will get just one occurance of
message independent of clients count.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
