Repository: ignite Updated Branches: refs/heads/master 7f22f08f7 -> 19c990ce5
IGNITE-9422 Fixed NPE on clients when new binary meta from joined node arrived. - Fixes #4681. Signed-off-by: Alexey Goncharuk <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19c990ce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19c990ce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19c990ce Branch: refs/heads/master Commit: 19c990ce58825f7c39deb4f524b7a60b328e286c Parents: 7f22f08 Author: Ivan Daschinskiy <[email protected]> Authored: Thu Sep 6 12:35:05 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Sep 6 12:54:28 2018 +0300 ---------------------------------------------------------------------- .../binary/CacheObjectBinaryProcessorImpl.java | 9 +- ...cheObjectBinaryProcessorOnDiscoveryTest.java | 125 +++++++++++++++++++ .../ignite/testsuites/IgnitePdsTestSuite.java | 4 + 3 files changed, 135 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/19c990ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index d6b920a..4c101b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -492,7 +492,8 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm try { BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(oldMeta, newMeta0); - metadataFileStore.mergeAndWriteMetadata(mergedMeta); + if (!ctx.clientNode()) + metadataFileStore.mergeAndWriteMetadata(mergedMeta); metadataLocCache.put(typeId, new BinaryMetadataHolder(mergedMeta, 0, 0)); } @@ -1016,7 +1017,8 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm localMetaHolder.pendingVersion(), localMetaHolder.acceptedVersion())); - metadataFileStore.writeMetadata(mergedMeta); + if (!ctx.clientNode()) + metadataFileStore.writeMetadata(mergedMeta); } } else { @@ -1032,7 +1034,8 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm metadataLocCache.put(metaEntry.getKey(), newMetaHolder); - metadataFileStore.writeMetadata(newMeta); + if (!ctx.clientNode()) + metadataFileStore.writeMetadata(newMeta); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19c990ce/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java new file mode 100644 index 0000000..279d3c8 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java @@ -0,0 +1,125 @@ +/* + * 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.persistence; + +import java.util.Arrays; +import org.apache.ignite.Ignite; +import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.binary.BinaryObjectBuilder; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.failure.StopNodeFailureHandler; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +/** + * + */ +public class IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest extends GridCommonAbstractTest { + /** */ + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + if ("client".equals(igniteInstanceName)) + cfg.setClientMode(true).setFailureHandler(new StopNodeFailureHandler()); + + return cfg.setDiscoverySpi(new TcpDiscoverySpi() + .setIpFinder(IP_FINDER)) + .setDataStorageConfiguration(new DataStorageConfiguration() + .setDefaultDataRegionConfiguration(new DataRegionConfiguration() + .setPersistenceEnabled(true))); + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + stopAllGrids(); + + cleanPersistenceDir(); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + + cleanPersistenceDir(); + } + + /** + * Tests that joining node metadata correctly handled on client. + * @throws Exception If fails. + */ + public void testJoiningNodeBinaryMetaOnClient() throws Exception { + IgniteEx ig0 = (IgniteEx)startGrids(2); + + ig0.cluster().active(true); + + addBinaryType(ig0, "test_1", new IgniteBiTuple<>("name", String.class)); + + stopGrid(0); + + Ignite ig1 = grid(1); + + // Modify existing type. + addBinaryType(ig1, "test_1", new IgniteBiTuple<>("id", Integer.class)); + + // Add new type. + addBinaryType(ig1, "test_2", new IgniteBiTuple<>("name", String.class)); + + stopGrid(1); + + startGrid(0); + + IgniteEx client = startGrid(getConfiguration("client")); + + startGrid(1); + + awaitPartitionMapExchange(); + + // Check that new metadata from grid_1 was handled without NPE on client. + assertNull(client.context().failure().failureContext()); + + // Check that metadata from grid_1 correctly loaded on client. + assertTrue(client.binary().type("test_1").fieldNames().containsAll(Arrays.asList("id", "name"))); + assertTrue(client.binary().type("test_2").fieldNames().contains("name")); + } + + /** + * @param ig Ig. + * @param typeName Type name. + * @param fields Fields. + */ + @SafeVarargs + private final BinaryObject addBinaryType(Ignite ig, String typeName, IgniteBiTuple<String, Class<?>>... fields) { + BinaryObjectBuilder builder = ig.binary().builder(typeName); + + if (fields != null) { + for (IgniteBiTuple<String,Class<?>> field: fields) + builder.setField(field.get1(), field.get2()); + } + + return builder.build(); + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/19c990ce/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java index 0a995da..9f50b32 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java @@ -20,6 +20,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.pagemem.impl.PageMemoryNoLoadSelfTest; import org.apache.ignite.internal.processors.cache.IgniteClusterActivateDeactivateTestWithPersistence; +import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDestroyCacheTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDestroyCacheWithoutCheckpointsTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCacheConfigurationFileConsistencyCheckTest; @@ -95,6 +96,9 @@ public class IgnitePdsTestSuite extends TestSuite { suite.addTestSuite(ExplicitWalDeltaConsistencyTest.class); suite.addTestSuite(SysPropWalDeltaConsistencyTest.class); + // Binary meta tests. + suite.addTestSuite(IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.class); + return suite; }
