You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2021/06/11 06:50:14 UTC
[ignite] branch master updated: IGNITE-14856 Fix "Failed to resolve
class name" on server when cache with indexed types is defined on client
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn 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 9a96166 IGNITE-14856 Fix "Failed to resolve class name" on server when cache with indexed types is defined on client
9a96166 is described below
commit 9a96166fbe01b5eaedce30f94dbb5a965170d555
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Fri Jun 11 09:49:51 2021 +0300
IGNITE-14856 Fix "Failed to resolve class name" on server when cache with indexed types is defined on client
* Restore `registerMetadataForRegisteredCaches` call in `GridQueryProcessor#start` - this fixes Java-side behavior, but breaks registration for platform types, because `PlatformProcessor` is not available at this point
* Call `registerMetadataForRegisteredCaches` second time from `PlatformProcessorImpl.start` only for platform types
---
.../processors/platform/PlatformProcessorImpl.java | 3 +
.../processors/query/GridQueryProcessor.java | 32 +--
...IgniteMarshallerCacheSeparateDirectoryTest.java | 214 +++++++++++++++++++++
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../Query/QueryEntityMetadataRegistrationTest.cs | 4 +
.../dotnet/Apache.Ignite.Core.Tests/ShellTests.cs | 1 -
.../dotnet/Apache.Ignite.Core/Impl/Shell.cs | 18 +-
7 files changed, 242 insertions(+), 32 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index 71baa87..4ebc8fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@ -302,6 +302,9 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
// Add Interop node attributes.
ctx.addNodeAttribute(PlatformUtils.ATTR_PLATFORM, interopCfg.platform());
+
+ // Register query entity meta.
+ ctx.query().registerMetadataForRegisteredCaches(true);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index f3e4f99..916e595 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -304,6 +304,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}, QRY_DETAIL_METRICS_EVICTION_FREQ, QRY_DETAIL_METRICS_EVICTION_FREQ);
idxRebuildStateStorage.start();
+
+ registerMetadataForRegisteredCaches(false);
}
/** {@inheritDoc} */
@@ -347,8 +349,6 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If failed.
*/
public void onCacheKernalStart() throws IgniteCheckedException {
- registerMetadataForRegisteredCaches();
-
synchronized (stateMux) {
exchangeReady = true;
@@ -1140,10 +1140,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
/**
* Register metadata locally for already registered caches.
+ *
+ * @param platformOnly Whether to register non-Java platformOnly types only.
*/
- private void registerMetadataForRegisteredCaches() {
+ public void registerMetadataForRegisteredCaches(boolean platformOnly) {
for (DynamicCacheDescriptor cacheDescriptor : ctx.cache().cacheDescriptors().values())
- registerBinaryMetadata(cacheDescriptor.cacheConfiguration(), cacheDescriptor.schema());
+ registerBinaryMetadata(cacheDescriptor.cacheConfiguration(), cacheDescriptor.schema(), platformOnly);
}
/**
@@ -1157,7 +1159,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
continue;
try {
- registerBinaryMetadata(req.startCacheConfiguration(), req.schema());
+ registerBinaryMetadata(req.startCacheConfiguration(), req.schema(), false);
}
catch (BinaryObjectException e) {
ctx.cache().completeCacheStartFuture(req, false, e);
@@ -1170,9 +1172,10 @@ public class GridQueryProcessor extends GridProcessorAdapter {
*
* @param ccfg Cache configuration.
* @param schema Schema for which register metadata is required.
+ * @param platformOnly Whether to register non-Java platformOnly types only.
* @throws BinaryObjectException if register was failed.
*/
- private void registerBinaryMetadata(CacheConfiguration ccfg, QuerySchema schema) throws BinaryObjectException {
+ private void registerBinaryMetadata(CacheConfiguration ccfg, QuerySchema schema, boolean platformOnly) throws BinaryObjectException {
if (schema != null) {
Collection<QueryEntity> qryEntities = schema.entities();
@@ -1181,8 +1184,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (binaryEnabled) {
for (QueryEntity qryEntity : qryEntities) {
- registerTypeLocally(qryEntity.findKeyType());
- registerTypeLocally(qryEntity.findValueType());
+ registerTypeLocally(qryEntity.findKeyType(), platformOnly);
+ registerTypeLocally(qryEntity.findValueType(), platformOnly);
}
}
}
@@ -1270,9 +1273,10 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* Register class metadata locally if it didn't do it earlier.
*
* @param clsName Class name for which the metadata should be registered.
+ * @param platformOnly Whether to only register non-Java platform types only.
* @throws BinaryObjectException if register was failed.
*/
- private void registerTypeLocally(String clsName) throws BinaryObjectException {
+ private void registerTypeLocally(String clsName, boolean platformOnly) throws BinaryObjectException {
if (clsName == null)
return;
@@ -1283,8 +1287,10 @@ public class GridQueryProcessor extends GridProcessorAdapter {
Class<?> cls = U.box(U.classForName(clsName, null, true));
- if (cls != null)
- binProc.binaryContext().registerClass(cls, true, false, true);
+ if (cls != null) {
+ if (!platformOnly)
+ binProc.binaryContext().registerClass(cls, true, false, true);
+ }
else
registerPlatformTypeLocally(clsName, binProc);
}
@@ -1299,9 +1305,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
private void registerPlatformTypeLocally(String clsName, CacheObjectBinaryProcessorImpl binProc) {
PlatformProcessor platformProc = ctx.platform();
- assert platformProc != null : "Platform processor must be initialized";
-
- if (!platformProc.hasContext())
+ if (platformProc == null || !platformProc.hasContext())
return;
PlatformContext platformCtx = platformProc.context();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheSeparateDirectoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheSeparateDirectoryTest.java
new file mode 100644
index 0000000..fee64c9
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheSeparateDirectoryTest.java
@@ -0,0 +1,214 @@
+/*
+ * 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.processors.cache;
+
+import java.io.File;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+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.IgniteRunnable;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+/**
+ * Tests cache metadata exchange when marshaller directory is not shared between server and client.
+ */
+public class IgniteMarshallerCacheSeparateDirectoryTest extends GridCommonAbstractTest {
+ /** */
+ public static final String KEY = "key";
+
+ /** */
+ public static final String SERVER = "server";
+
+ /** */
+ public static final String CLIENT = "client";
+
+ /** */
+ private boolean ccfgOnClient;
+
+ /** */
+ private boolean ccfgOnServer;
+
+ /** */
+ private boolean indexedTypes;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ cfg.setPeerClassLoadingEnabled(false);
+
+ ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
+ cfg.setWorkDirectory(workDir(igniteInstanceName).getAbsolutePath());
+
+ if (igniteInstanceName.equals(SERVER) && ccfgOnServer ||
+ igniteInstanceName.equals(CLIENT) && ccfgOnClient) {
+ CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
+
+ ccfg.setBackups(1);
+
+ if (indexedTypes)
+ ccfg.setIndexedTypes(String.class, TestClass.class);
+
+ cfg.setCacheConfiguration(ccfg);
+ }
+
+ if (igniteInstanceName.equals(CLIENT))
+ cfg.setClientMode(true);
+
+ return cfg;
+ }
+
+ /** */
+ private File workDir(String igniteInstanceName) {
+ return new File(U.getIgniteHome() + File.separator + igniteInstanceName + "-work");
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ U.delete(workDir(SERVER));
+ U.delete(workDir(CLIENT));
+
+ super.afterTest();
+ }
+
+ /** */
+ @Test
+ public void testRegular() throws Exception {
+ run(true, true, false, AccessMode.SERVER, AccessMode.CLIENT);
+ }
+
+ /** */
+ @Test
+ public void testIndexed() throws Exception {
+ run(true, true, true, AccessMode.CLIENT, AccessMode.SERVER);
+ }
+
+ /** */
+ @Test
+ public void testIndexedClosure() throws Exception {
+ run(true, true, true, AccessMode.CLOSURE, AccessMode.CLOSURE);
+ }
+
+ /** */
+ @Test
+ public void testClientCcfgIndexedGetClosure() throws Exception {
+ run(true, false, true, AccessMode.CLIENT, AccessMode.CLOSURE);
+ }
+
+ /** */
+ @Test
+ public void testClientCcfgGetClosure() throws Exception {
+ run(true, false, false, AccessMode.CLIENT, AccessMode.CLOSURE);
+ }
+
+ /** */
+ @Test
+ public void testServerCcfgIndexedGetClosure() throws Exception {
+ run(false, true, true, AccessMode.CLIENT, AccessMode.CLOSURE);
+ }
+
+ /** */
+ @Test
+ public void testServerCcfgIndexed() throws Exception {
+ run(false, true, true, AccessMode.SERVER, AccessMode.CLIENT);
+ }
+
+ /** */
+ @Test
+ public void testClientCcfgIndexedClosure() throws Exception {
+ run(true, false, true, AccessMode.CLOSURE, AccessMode.CLOSURE);
+ }
+
+ /** */
+ @Test
+ public void testClientCcfgIndexed() throws Exception {
+ run(true, false, false, AccessMode.CLIENT, AccessMode.SERVER);
+ }
+
+ /** */
+ @Test
+ public void testClientCcfgIndexedPutClosure() throws Exception {
+ run(false, true, true, AccessMode.CLOSURE, AccessMode.CLIENT);
+ }
+
+ /** */
+ @Test
+ public void testServerCcfgPutClosure() throws Exception {
+ run(true, false, false, AccessMode.CLOSURE, AccessMode.SERVER);
+ }
+
+ /** */
+ private void run(boolean ccfgOnClient, boolean ccfgOnServer, boolean indexedTypes,
+ AccessMode putMode, AccessMode getMode) throws Exception {
+ this.ccfgOnClient = ccfgOnClient;
+ this.ccfgOnServer = ccfgOnServer;
+ this.indexedTypes = indexedTypes;
+
+ Ignite server = startGrid(SERVER);
+
+ Ignite client = startGrid(CLIENT);
+
+ if (putMode == AccessMode.CLOSURE) {
+ client.compute().run(new IgniteRunnable() {
+ @Override public void run() {
+ Ignition.ignite(SERVER).cache(DEFAULT_CACHE_NAME).put(KEY, new TestClass());
+ }
+ });
+ }
+ else
+ (putMode == AccessMode.SERVER ? server : client).cache(DEFAULT_CACHE_NAME).put(KEY, new TestClass());
+
+ Object val;
+
+ if (getMode == AccessMode.CLOSURE) {
+ val = client.compute().call(new IgniteCallable<Object>() {
+ @Override public Object call() throws Exception {
+ return Ignition.ignite(SERVER).cache(DEFAULT_CACHE_NAME).get(KEY);
+ }
+ });
+ }
+ else
+ val = (putMode == AccessMode.SERVER ? server : client).cache(DEFAULT_CACHE_NAME).get(KEY);
+
+ assertNotNull(val);
+ assertTrue(val.toString().contains("TestClass"));
+ }
+
+ /** */
+ private enum AccessMode {
+ SERVER,
+ CLIENT,
+ CLOSURE;
+ }
+
+ /** */
+ static class TestClass {
+ @QuerySqlField
+ private int f = 42;
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 0bb64f6..abb6a20 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -75,6 +75,7 @@ import org.apache.ignite.internal.processors.cache.IgniteMarshallerCacheClassNam
import org.apache.ignite.internal.processors.cache.IgniteMarshallerCacheClientRequestsMappingOnMissTest;
import org.apache.ignite.internal.processors.cache.IgniteMarshallerCacheConcurrentReadWriteTest;
import org.apache.ignite.internal.processors.cache.IgniteMarshallerCacheFSRestoreTest;
+import org.apache.ignite.internal.processors.cache.IgniteMarshallerCacheSeparateDirectoryTest;
import org.apache.ignite.internal.processors.cache.RebalanceWithDifferentThreadPoolSizeTest;
import org.apache.ignite.internal.processors.cache.SetTxTimeoutOnPartitionMapExchangeTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteRejectConnectOnNodeStopTest;
@@ -244,6 +245,7 @@ import org.junit.runners.Suite;
IgniteMarshallerCacheFSRestoreTest.class,
IgniteMarshallerCacheClassNameConflictTest.class,
IgniteMarshallerCacheClientRequestsMappingOnMissTest.class,
+ IgniteMarshallerCacheSeparateDirectoryTest.class,
IgniteDiagnosticMessagesTest.class,
IgniteDiagnosticMessagesMultipleConnectionsTest.class,
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/QueryEntityMetadataRegistrationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/QueryEntityMetadataRegistrationTest.cs
index afa29f0..ec28259 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/QueryEntityMetadataRegistrationTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/QueryEntityMetadataRegistrationTest.cs
@@ -22,6 +22,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query
{
using System.IO;
using System.Linq;
+ using System.Reflection;
using Apache.Ignite.Core.Cache.Affinity;
using Apache.Ignite.Core.Cache.Configuration;
using Apache.Ignite.Core.Client;
@@ -58,6 +59,9 @@ namespace Apache.Ignite.Core.Tests.Cache.Query
{
SpringConfigUrl = springConfig,
IgniteInstanceName = i.ToString(),
+ WorkDirectory = Path.Combine(
+ Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
+ "ignite_work_" + GetType().Name + "_" + i),
// Cache configs will be merged with Spring cache configs.
CacheConfiguration = new[]
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ShellTests.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ShellTests.cs
index 0a443a1..220c071 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ShellTests.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ShellTests.cs
@@ -17,7 +17,6 @@
namespace Apache.Ignite.Core.Tests
{
- using System;
using Apache.Ignite.Core.Impl;
using Apache.Ignite.Core.Impl.Unmanaged;
using NUnit.Framework;
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Shell.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Shell.cs
index 2c729ed..37d96d3 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Shell.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Shell.cs
@@ -20,7 +20,6 @@ namespace Apache.Ignite.Core.Impl
using System;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
- using System.Text;
/// <summary>
/// Shell utils (cmd/bash).
@@ -42,35 +41,20 @@ namespace Apache.Ignite.Core.Impl
FileName = file,
Arguments = args,
RedirectStandardOutput = true,
- RedirectStandardError = true,
UseShellExecute = false,
CreateNoWindow = true
};
- var sb = new StringBuilder();
-
using (var process = new Process {StartInfo = processStartInfo})
{
- process.OutputDataReceived += (_, eventArgs) =>
- {
- sb.Append(eventArgs.Data);
- };
-
- process.ErrorDataReceived += (_, eventArgs) =>
- {
- sb.Append(eventArgs.Data);
- };
-
process.Start();
- process.BeginOutputReadLine();
- process.BeginErrorReadLine();
if (!process.WaitForExit(timeoutMs))
{
process.Kill();
}
- return sb.ToString();
+ return process.StandardOutput.ReadToEnd();
}
}
catch (Exception)