This is an automated email from the ASF dual-hosted git repository. sergeychugunov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push: new 177e4a3007a IGNITE-17857 The native client does not need to verify the configuration consistency of the DeploymentSpi - Fixes #10297. 177e4a3007a is described below commit 177e4a3007ab7b05f4ab174063bb5f24d03d6bad Author: liyujue <liyu...@ignite-service.cn> AuthorDate: Mon Oct 17 16:06:12 2022 +0300 IGNITE-17857 The native client does not need to verify the configuration consistency of the DeploymentSpi - Fixes #10297. Signed-off-by: Sergey Chugunov <sergey.chugu...@gmail.com> --- .../spi/deployment/local/LocalDeploymentSpi.java | 1 - .../uri/GridUriDeploymentConfigSelfTest.java | 31 +++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java index 1748506c0e3..51edd6683dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java @@ -65,7 +65,6 @@ import org.jsr166.ConcurrentLinkedHashMap; * @see org.apache.ignite.spi.deployment.DeploymentSpi */ @IgniteSpiMultipleInstancesSupport(true) -@IgniteSpiConsistencyChecked(optional = false) @IgnoreIfPeerClassLoadingDisabled public class LocalDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi { /** Enables additional check for resource name on resources removal. */ diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java index 441bef04952..61617af6ca1 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java @@ -17,11 +17,15 @@ package org.apache.ignite.spi.deployment.uri; -import java.util.Collections; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.junit.Test; +import java.io.File; +import java.util.Arrays; +import java.util.Collections; /** * */ @@ -36,4 +40,29 @@ public class GridUriDeploymentConfigSelfTest extends GridSpiAbstractConfigTest<U checkNegativeSpiProperty(new UriDeploymentSpi(), "uriList", Collections.singletonList("qwertyuiop"), false); checkNegativeSpiProperty(new UriDeploymentSpi(), "uriList", Collections.singletonList(null), false); } + + /** + * + * @throws Exception + */ + @Test + public void testClientSpiConsistencyChecked() throws Exception { + IgniteConfiguration scfg = super.getConfiguration(); + + UriDeploymentSpi deploymentSpi = new UriDeploymentSpi(); + String tmpDir = GridTestProperties.getProperty("deploy.uri.tmpdir"); + File tmp = new File(tmpDir); + if (!tmp.exists()){ + tmp.mkdir(); + } + deploymentSpi.setUriList(Arrays.asList("file://" + tmpDir)); + scfg.setDeploymentSpi(deploymentSpi); + startGrid("server" , scfg); + + IgniteConfiguration ccfg = super.getConfiguration(); + startClientGrid("client" , ccfg); + + stopGrid("server"); + stopGrid("client"); + } }