You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2024/09/19 08:26:15 UTC
(ignite) branch ignite-23190 created (now 8f4f542d0d6)
This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a change to branch ignite-23190
in repository https://gitbox.apache.org/repos/asf/ignite.git
at 8f4f542d0d6 IGNITE-23190 Fix local class deployments cache cleanup on reconnect
This branch includes the following new commits:
new 8f4f542d0d6 IGNITE-23190 Fix local class deployments cache cleanup on reconnect
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(ignite) 01/01: IGNITE-23190 Fix local class deployments cache cleanup on reconnect
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a commit to branch ignite-23190
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 8f4f542d0d6672b10f7fa4dac194bb995a8a519a
Author: Aleksey Plekhanov <pl...@gmail.com>
AuthorDate: Thu Sep 19 11:24:04 2024 +0300
IGNITE-23190 Fix local class deployments cache cleanup on reconnect
---
.../deployment/GridDeploymentLocalStore.java | 17 +++++
.../IgniteClientReconnectDeploymentTest.java | 81 ++++++++++++++++++++++
.../testsuites/IgniteClientReconnectTestSuite.java | 4 +-
3 files changed, 101 insertions(+), 1 deletion(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
index ecf9bf8e55a..2c47b84a79b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
@@ -105,6 +106,22 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter {
log.debug(stopInfo());
}
+ /** {@inheritDoc} */
+ @Override public void onKernalStart() throws IgniteCheckedException {
+ Set<ClassLoader> obsoleteClsLdrs = U.newIdentityHashSet();
+
+ synchronized (mux) {
+ // There can be obsolete class loaders in cache after client node reconnect with the new node id.
+ for (Entry<String, Deque<GridDeployment>> entry : cache.entrySet())
+ for (GridDeployment dep : entry.getValue())
+ if (!dep.classLoaderId().globalId().equals(ctx.localNodeId()))
+ obsoleteClsLdrs.add(dep.classLoader());
+ }
+
+ for (ClassLoader clsLdr : obsoleteClsLdrs)
+ undeploy(clsLdr);
+ }
+
/** {@inheritDoc} */
@Override public Collection<GridDeployment> getDeployments() {
Collection<GridDeployment> deps = new ArrayList<>();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectDeploymentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectDeploymentTest.java
new file mode 100644
index 00000000000..d335668e168
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectDeploymentTest.java
@@ -0,0 +1,81 @@
+/*
+ * 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 javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.testframework.junits.WithSystemProperty;
+import org.junit.Test;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCO_FAILED_CLIENT_RECONNECT_DELAY;
+
+/**
+ * Test local class deployment on client reconnect.
+ */
+@WithSystemProperty(key = IGNITE_DISCO_FAILED_CLIENT_RECONNECT_DELAY, value = "1000")
+public class IgniteClientReconnectDeploymentTest extends IgniteClientReconnectAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected int serverCount() {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int clientCount() {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ return super.getConfiguration(igniteInstanceName).setPeerClassLoadingEnabled(true);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ @Test
+ public void testDeployDuringReconnect() throws Exception {
+ IgniteEx client = grid(serverCount());
+
+ Ignite srv = ignite(0);
+
+ IgniteCache<Integer, Integer> cache = client.getOrCreateCache("test_cache");
+
+ reconnectClientNode(client, srv, () -> {
+ try {
+ client.context().deploy().deploy(TestEntryProcessor.class, TestEntryProcessor.class.getClassLoader());
+ }
+ catch (IgniteCheckedException e) {
+ throw new AssertionError(e);
+ }
+ });
+
+ assertTrue(cache.invoke(0, new TestEntryProcessor()));
+ }
+
+ /** */
+ private static class TestEntryProcessor implements EntryProcessor<Integer, Integer, Boolean> {
+ /** {@inheritDoc} */
+ @Override public Boolean process(MutableEntry<Integer, Integer> entry, Object... args) {
+ return true;
+ }
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java
index 81972154110..fd01faeeb85 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.IgniteClientReconnectCollectionsTest;
import org.apache.ignite.internal.IgniteClientReconnectComputeTest;
import org.apache.ignite.internal.IgniteClientReconnectContinuousProcessorTest;
import org.apache.ignite.internal.IgniteClientReconnectDelayedSpiTest;
+import org.apache.ignite.internal.IgniteClientReconnectDeploymentTest;
import org.apache.ignite.internal.IgniteClientReconnectDiscoveryStateTest;
import org.apache.ignite.internal.IgniteClientReconnectFailoverTest;
import org.apache.ignite.internal.IgniteClientReconnectLockTest;
@@ -58,7 +59,8 @@ import org.junit.runners.Suite;
IgniteClientReconnectServicesTest.class,
IgniteClientReconnectStreamerTest.class,
IgniteClientReconnectFailoverTest.class,
- IgniteClientRejoinTest.class
+ IgniteClientRejoinTest.class,
+ IgniteClientReconnectDeploymentTest.class,
})
public class IgniteClientReconnectTestSuite {
}