[ignite] branch master updated: IGNITE-7384 Ignore IgniteClusterActivateDeactivateTestWithPersistence.testDeactivateDuringEvictionAndRebalance in MVCC mode
This is an automated email from the ASF dual-hosted git repository. ipavlukhin 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 e568524 IGNITE-7384 Ignore IgniteClusterActivateDeactivateTestWithPersistence.testDeactivateDuringEvictionAndRebalance in MVCC mode e568524 is described below commit e5685248dc7f53388cfd6a30c8ecd4c98e833c18 Author: ipavlukhin AuthorDate: Wed Jul 10 17:17:53 2019 +0300 IGNITE-7384 Ignore IgniteClusterActivateDeactivateTestWithPersistence.testDeactivateDuringEvictionAndRebalance in MVCC mode --- .../cache/IgniteClusterActivateDeactivateTestWithPersistence.java | 4 1 file changed, 4 insertions(+) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java index 3bd6819..49bf9e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java @@ -42,7 +42,9 @@ import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import static org.apache.ignite.IgniteSystemProperties.IGNITE_BASELINE_AUTO_ADJUST_ENABLED; @@ -367,6 +369,8 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl */ @Test public void testDeactivateDuringEvictionAndRebalance() throws Exception { + Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-7384;, MvccFeatureChecker.forcedMvcc()); + IgniteEx srv = (IgniteEx) startGrids(3); srv.cluster().active(true);
[ignite] branch master updated: IGNITE-11907 Fail Continuous Query registration and do not fail node if remote filter class is missing - Fixes #6645.
This is an automated email from the ASF dual-hosted git repository. ipavlukhin 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 4fe0371 IGNITE-11907 Fail Continuous Query registration and do not fail node if remote filter class is missing - Fixes #6645. 4fe0371 is described below commit 4fe0371c00a3204030b4e1fbe6db3d2d54412b48 Author: ipavlukhin AuthorDate: Wed Jul 10 12:48:48 2019 +0300 IGNITE-11907 Fail Continuous Query registration and do not fail node if remote filter class is missing - Fixes #6645. Signed-off-by: ipavlukhin --- .../IncompleteDeserializationException.java| 53 .../continuous/GridContinuousProcessor.java| 62 ++--- .../continuous/StartRoutineDiscoveryMessage.java | 40 +- .../messages/TcpDiscoveryCustomEventMessage.java | 14 +- .../IncompleteDeserializationExceptionTest.java| 132 ++ ...ueryRemoteFilterMissingInClassPathSelfTest.java | 148 +++-- .../ignite/testsuites/IgniteBasicTestSuite.java| 19 +-- .../ignite/internal/managers/discovery/Wrapper.ser | Bin 0 -> 260 bytes 8 files changed, 394 insertions(+), 74 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/IncompleteDeserializationException.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/IncompleteDeserializationException.java new file mode 100644 index 000..5a440ce --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/IncompleteDeserializationException.java @@ -0,0 +1,53 @@ +/* + * 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.discovery; + +import org.jetbrains.annotations.NotNull; + +/** + * Exception which can be used to access a message which failed to be deserialized completely using Java serialization. + * Throwed from deserialization methods it can be caught by a caller. + * + * Should be {@link RuntimeException} because of limitations of Java serialization mechanisms. + * + * Catching {@link ClassNotFoundException} inside deserialization methods cannot do the same trick because + * Java deserialization remembers such exception internally and will rethrow it anyway upon returing to a user. + */ +public class IncompleteDeserializationException extends RuntimeException { +/** */ +private static final long serialVersionUID = 0L; + +/** */ +private final DiscoveryCustomMessage m; + +/** + * @param m Message. + */ +public IncompleteDeserializationException(@NotNull DiscoveryCustomMessage m) { +super(null, null, false, false); + +this.m = m; +} + +/** + * @return Message. + */ +@NotNull public DiscoveryCustomMessage message() { +return m; +} +} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index f6bd571..eeb7303 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -1071,37 +1071,37 @@ public class GridContinuousProcessor extends GridProcessorAdapter { doStop = true; } -if (doStop) { -boolean stop = false; +if (doStop) { +boolean stop = false; -// Unregister routine locally. -LocalRoutineInfo routine = locInfos.remove(routineId); +// Unregister routine locally. +LocalRoutineInfo routine = locInfos.remove(routineId); -if (routine != null) { -stop = true; +if (routine != null) { +stop = true; -// Unregister handler locally. -unregisterHandler(routineId, routine.hnd, true); -} +
[ignite] branch ignite-11973 created (now 15dfc1b)
This is an automated email from the ASF dual-hosted git repository. av pushed a change to branch ignite-11973 in repository https://gitbox.apache.org/repos/asf/ignite.git. at 15dfc1b WIP This branch includes the following new commits: new 15dfc1b WIP 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: WIP
This is an automated email from the ASF dual-hosted git repository. av pushed a commit to branch ignite-11973 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 15dfc1b094e0ca04a23413bc73c36e930278bb23 Author: Anton Vinogradov AuthorDate: Wed Jul 10 10:51:37 2019 +0300 WIP Signed-off-by: Anton Vinogradov --- .../cache/CacheSerializableTransactionsTest.java | 32 -- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java index 555c85f..39b6ae5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java @@ -4075,7 +4075,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { */ @Test public void testAccountTx1() throws Exception { -accountTx(false, false, false, false); +accountTx(false, false, false, false, false); } /** @@ -4083,7 +4083,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { */ @Test public void testAccountTx2() throws Exception { -accountTx(true, false, false, false); +accountTx(true, false, false, false, false); } /** @@ -4091,7 +4091,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { */ @Test public void testAccountTxWithNonSerializable() throws Exception { -accountTx(false, false, true, false); +accountTx(false, false, true, false, false); } /** @@ -4099,7 +4099,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { */ @Test public void testAccountTxNearCache() throws Exception { -accountTx(false, true, false, false); +accountTx(false, true, false, false, false); } /** @@ -4107,7 +4107,15 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { */ @Test public void testAccountTxNodeRestart() throws Exception { -accountTx(false, false, false, true); +accountTx(false, false, false, true, false); +} + +/** + * @throws Exception If failed. + */ +@Test +public void testAccountTxNodeRestartWithReadRepair() throws Exception { +accountTx(false, false, false, true, true); } /** @@ -4115,12 +4123,14 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { * @param nearCache If {@code true} near cache is enabled. * @param nonSer If {@code true} starts threads executing non-serializable transactions. * @param restart If {@code true} restarts one node. + * @param readRepair If {@code true} uses withReadRepair proxy. * @throws Exception If failed. */ private void accountTx(final boolean getAll, final boolean nearCache, final boolean nonSer, -final boolean restart) throws Exception { +final boolean restart, +final boolean readRepair) throws Exception { final Ignite srv = ignite(1); CacheConfiguration ccfg = cacheConfiguration(PARTITIONED, FULL_SYNC, 1, false, false); @@ -4161,10 +4171,13 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { final IgniteTransactions txs = node.transactions(); -final IgniteCache cache = +IgniteCache cache = nearCache ? node.createNearCache(cacheName, new NearCacheConfiguration()) : node.cache(cacheName); +if (readRepair) +cache = cache.withReadRepair(); + assertNotNull(cache); ThreadLocalRandom rnd = ThreadLocalRandom.current(); @@ -4219,10 +4232,13 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { final IgniteTransactions txs = node.transactions(); -final IgniteCache cache = +IgniteCache cache = nearCache ? node.createNearCache(cacheName, new NearCacheConfiguration()) : node.cache(cacheName); +if (readRepair) +cache = cache.withReadRepair(); + assertNotNull(cache); ThreadLocalRandom rnd = ThreadLocalRandom.current();
[ignite] branch ignite-11973 deleted (was 15dfc1b)
This is an automated email from the ASF dual-hosted git repository. av pushed a change to branch ignite-11973 in repository https://gitbox.apache.org/repos/asf/ignite.git. was 15dfc1b WIP This change permanently discards the following revisions: discard 15dfc1b WIP
[ignite] branch ignite-11704 created (now d5e4e78)
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a change to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git. at d5e4e78 ignite-11704 This branch includes the following new commits: new 312e76d2 ignite-11704 new 345a7a5 Merge remote-tracking branch 'remotes/origin/master' into ignite-11704 new d5e4e78 ignite-11704 The 3 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] 02/03: Merge remote-tracking branch 'remotes/origin/master' into ignite-11704
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 345a7a5b8c6dca1d5c5ff34149ed632e724a3a5f Merge: 312e76d2 1557188 Author: sboikov AuthorDate: Wed Jul 10 09:10:54 2019 +0300 Merge remote-tracking branch 'remotes/origin/master' into ignite-11704 examples/pom-standalone-lgpl.xml | 18 -- examples/pom-standalone.xml| 18 -- .../ComputeContinuousMapperExample.java| 3 +- .../computegrid/ComputeTaskMapExample.java | 3 +- .../ignite/examples/BasicExamplesSelfTest.java | 47 ++--- .../ignite/examples/CacheExamplesSelfTest.java | 219 +++-- .../examples/CheckpointExamplesSelfTest.java | 31 ++- .../examples/ClusterGroupExampleSelfTest.java | 19 +- .../ContinuationExamplesMultiNodeSelfTest.java | 3 - .../examples/ContinuationExamplesSelfTest.java | 16 +- .../ContinuousMapperExamplesMultiNodeSelfTest.java | 3 - .../examples/ContinuousMapperExamplesSelfTest.java | 14 +- .../DeploymentExamplesMultiNodeSelfTest.java | 15 +- .../examples/DeploymentExamplesSelfTest.java | 15 +- .../ignite/examples/IgfsExamplesSelfTest.java | 40 ++-- .../ignite/examples/LifecycleExamplesSelfTest.java | 16 +- .../MemcacheRestExamplesMultiNodeSelfTest.java | 15 +- .../examples/MemcacheRestExamplesSelfTest.java | 38 ++-- .../ignite/examples/MessagingExamplesSelfTest.java | 16 +- .../MonteCarloExamplesMultiNodeSelfTest.java | 3 - .../examples/MonteCarloExamplesSelfTest.java | 16 +- .../examples/SpringBeanExamplesSelfTest.java | 16 +- .../examples/TaskExamplesMultiNodeSelfTest.java| 3 - .../ignite/examples/TaskExamplesSelfTest.java | 37 ++-- .../direct/singlesplit/SingleSplitTestTask.java| 3 +- .../main/java/org/apache/ignite/IgniteCompute.java | 8 +- .../java/org/apache/ignite/IgniteScheduler.java| 34 ++-- .../org/apache/ignite/IgniteSystemProperties.java | 2 +- .../org/apache/ignite/compute/ComputeTask.java | 3 +- .../ignite/compute/ComputeTaskSplitAdapter.java| 3 +- .../gridify/aop/GridifyDefaultRangeTask.java | 3 +- .../compute/gridify/aop/GridifyDefaultTask.java| 3 +- .../configuration/ConnectorConfiguration.java | 8 +- .../configuration/DataStorageConfiguration.java| 54 +++-- .../ignite/internal/GridTaskSessionImpl.java | 56 -- .../org/apache/ignite/internal/IgniteKernal.java | 3 +- .../ignite/internal/IgniteSchedulerImpl.java | 12 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 + .../internal/MarshallerMappingFileStore.java | 4 +- .../binary/streams/BinaryMemoryAllocatorChunk.java | 8 +- .../connection/GridClientNioTcpConnection.java | 2 + .../ignite/internal/cluster/IgniteKillTask.java| 3 +- .../internal/commandline/BaselineCommand.java | 20 +- .../internal/commandline/CommandArgIterator.java | 10 +- .../internal/commandline/CommandHandler.java | 96 ++--- .../ignite/internal/commandline/StateCommand.java | 3 +- .../internal/executor/GridExecutorService.java | 48 +++-- .../managers/discovery/GridDiscoveryManager.java | 10 +- .../eventstorage/GridEventStorageManager.java | 13 +- .../internal/pagemem/wal/record/PageSnapshot.java | 44 +++-- .../processors/cache/GridCacheAdapter.java | 9 +- .../cache/GridCachePartitionExchangeManager.java | 6 +- .../distributed/GridDistributedCacheAdapter.java | 2 +- .../preloader/GridDhtPartitionsExchangeFuture.java | 20 +- .../dht/topology/GridDhtPartitionTopologyImpl.java | 18 +- .../dht/topology/PartitionsEvictManager.java | 8 +- .../GridCacheDatabaseSharedManager.java| 32 +-- .../cache/persistence/GridCacheOffheapManager.java | 8 +- .../cache/persistence/file/AbstractFileIO.java | 4 +- .../pagemem/IntervalBasedMeasurement.java | 3 +- .../wal/filehandle/FileHandleManagerImpl.java | 21 +- .../query/jdbc/GridCacheQueryJdbcMetadataTask.java | 3 +- .../cache/query/jdbc/GridCacheQueryJdbcTask.java | 3 +- .../transactions/IgniteTxLocalStateAdapter.java| 3 +- .../verify/CollectConflictPartitionKeysTask.java | 3 +- .../RetrieveConflictPartitionValuesTask.java | 3 +- .../verify/VerifyBackupPartitionsDumpTask.java | 3 +- .../cache/verify/VerifyBackupPartitionsTask.java | 3 +- .../cache/verify/VerifyBackupPartitionsTaskV2.java | 3 +- .../processors/cache/verify/ViewCacheClosure.java | 5 +- .../processors/closure/GridClosureProcessor.java | 22 +-- .../compute/PlatformBalancingMultiClosureTask.java | 3 +- ...PlatformBalancingSingleClosureAffinityTask.java | 3 +- .../PlatformBalancingSingleClosureTask.java| 3 +- .../PlatformBroadcastingMultiClosureTask.java
[ignite] 01/03: ignite-11704
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 312e76d2e85917cfcda530cc40a2c8de74310e0d Author: sboikov AuthorDate: Tue Jul 9 13:42:56 2019 +0300 ignite-11704 --- .../processors/cache/CacheGroupContext.java| 9 + .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheMapEntry.java| 195 +++-- .../cache/IgniteCacheOffheapManager.java | 43 +++- .../cache/IgniteCacheOffheapManagerImpl.java | 243 + .../processors/cache/persistence/CacheDataRow.java | 5 + .../cache/persistence/CacheDataRowAdapter.java | 5 + .../cache/persistence/GridCacheOffheapManager.java | 19 +- .../internal/processors/cache/tree/DataRow.java| 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java| 2 +- .../processors/database/CacheFreeListSelfTest.java | 5 + .../query/h2/database/H2PkHashIndex.java | 2 +- .../processors/query/h2/opt/H2CacheRow.java| 5 + 13 files changed, 364 insertions(+), 179 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java index 4fc43fd..56c2449 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java @@ -46,6 +46,7 @@ import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCach import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentResponse; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader; +import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition; import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology; import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopologyImpl; import org.apache.ignite.internal.processors.cache.persistence.DataRegion; @@ -1299,6 +1300,14 @@ public class CacheGroupContext { return hasAtomicCaches; } +public boolean supportsTombstone() { +return !hasAtomicCaches && !mvccEnabled && !isLocal(); +} + +public boolean createTombstone(@Nullable GridDhtLocalPartition part) { +return part != null && supportsTombstone(); +} + /** * @return Metrics. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 9d52c75..87c6253 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -625,8 +625,8 @@ public class GridCacheContext implements Externalizable { public void cache(GridCacheAdapter cache) { this.cache = cache; -deferredDel = cache.isDht() || cache.isDhtAtomic() || cache.isColocated() || -(cache.isNear() && cache.configuration().getAtomicityMode() == ATOMIC); +deferredDel = !grp.supportsTombstone() && (cache.isDht() || cache.isDhtAtomic() || cache.isColocated() || +(cache.isNear() && cache.configuration().getAtomicityMode() == ATOMIC)); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index f1b7ec7..adc8699 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -98,9 +98,9 @@ import org.apache.ignite.internal.util.typedef.T3; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteInClosure; -import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.NotNull; @@ -1713,13 +1713,14 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme interceptRes =
[ignite] 03/03: ignite-11704
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git commit d5e4e788893e6caa574eb0d1a2b62fbbea210f37 Author: sboikov AuthorDate: Wed Jul 10 10:25:56 2019 +0300 ignite-11704 --- .../org/apache/ignite/internal/processors/cache/CacheGroupContext.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java index 56c2449..4af5de5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java @@ -268,6 +268,8 @@ public class CacheGroupContext { statHolderIdx = new IoStatisticsHolderIndex(HASH_INDEX, cacheOrGroupName(), HASH_PK_IDX_NAME, mmgr); statHolderData = new IoStatisticsHolderCache(cacheOrGroupName(), grpId, mmgr); } + +hasAtomicCaches = ccfg.getAtomicityMode() == ATOMIC; } /**