Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2a7d8865 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2a7d8865 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2a7d8865 Branch: refs/heads/ignite-1093-3 Commit: 2a7d886553a967b330342d7b6734a256ce890946 Parents: a5d50a6 c39b6d4 Author: Anton Vinogradov <[email protected]> Authored: Wed Oct 28 17:11:30 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed Oct 28 17:11:30 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiThreadedSelfTest.java | 3 +- .../apache/ignite/IgniteSystemProperties.java | 9 + .../affinity/fair/FairAffinityFunction.java | 497 +- .../rendezvous/RendezvousAffinityFunction.java | 140 +- .../configuration/TransactionConfiguration.java | 6 +- .../apache/ignite/internal/IgniteKernal.java | 69 +- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../processors/cache/CacheMetricsImpl.java | 12 +- .../processors/cache/GridCacheAdapter.java | 459 +- .../processors/cache/GridCacheEntryEx.java | 62 +- .../processors/cache/GridCacheMapEntry.java | 137 +- .../processors/cache/GridCacheMvcc.java | 143 +- .../cache/GridCacheMvccCandidate.java | 26 +- .../processors/cache/GridCacheProcessor.java | 26 - .../processors/cache/GridCacheUtils.java | 50 + .../distributed/GridDistributedCacheEntry.java | 12 +- .../GridDistributedTxRemoteAdapter.java | 56 +- .../dht/CacheDistributedGetFutureAdapter.java | 158 + .../distributed/dht/GridDhtCacheAdapter.java | 17 +- .../distributed/dht/GridDhtCacheEntry.java | 23 +- .../cache/distributed/dht/GridDhtGetFuture.java | 199 +- .../distributed/dht/GridDhtLockFuture.java | 5 +- .../dht/GridDhtTransactionalCacheAdapter.java | 105 +- .../cache/distributed/dht/GridDhtTxLocal.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 109 +- .../dht/GridPartitionedGetFuture.java | 179 +- .../dht/atomic/GridDhtAtomicCache.java | 16 +- .../dht/colocated/GridDhtColocatedCache.java | 130 +- .../colocated/GridDhtColocatedLockFuture.java | 6 +- .../distributed/near/GridNearAtomicCache.java | 2 - .../distributed/near/GridNearCacheAdapter.java | 32 +- .../distributed/near/GridNearCacheEntry.java | 81 +- .../distributed/near/GridNearGetFuture.java | 340 +- .../distributed/near/GridNearGetRequest.java | 3 - ...arOptimisticSerializableTxPrepareFuture.java | 930 ++++ .../near/GridNearOptimisticTxPrepareFuture.java | 252 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 222 + .../GridNearPessimisticTxPrepareFuture.java | 8 +- .../near/GridNearTransactionalCache.java | 14 +- .../near/GridNearTxFinishFuture.java | 12 +- .../cache/distributed/near/GridNearTxLocal.java | 157 +- .../near/GridNearTxPrepareFutureAdapter.java | 13 +- .../cache/local/GridLocalCacheEntry.java | 23 +- .../cache/local/GridLocalLockFuture.java | 2 + .../local/atomic/GridLocalAtomicCache.java | 9 - .../continuous/CacheContinuousQueryManager.java | 6 +- .../transactions/IgniteTransactionsImpl.java | 6 - .../cache/transactions/IgniteTxAdapter.java | 123 +- .../cache/transactions/IgniteTxEntry.java | 51 +- .../cache/transactions/IgniteTxHandler.java | 4 +- .../transactions/IgniteTxLocalAdapter.java | 832 ++-- .../cache/transactions/IgniteTxLocalEx.java | 27 +- .../cache/transactions/IgniteTxManager.java | 327 +- .../cache/version/GridCacheVersionManager.java | 73 +- .../datastreamer/DataStreamerImpl.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 8 +- .../optimized/OptimizedMarshaller.java | 10 +- .../optimized/OptimizedMarshallerUtils.java | 35 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 52 + .../apache/ignite/transactions/Transaction.java | 2 +- .../transactions/TransactionIsolation.java | 3 +- .../AbstractAffinityFunctionSelfTest.java | 293 ++ .../affinity/AffinityClientNodeSelfTest.java | 194 + ...ityFunctionBackupFilterAbstractSelfTest.java | 138 + ...unctionExcludeNeighborsAbstractSelfTest.java | 182 + .../affinity/IgniteClientNodeAffinityTest.java | 194 - .../fair/FairAffinityDynamicCacheSelfTest.java | 99 + ...airAffinityFunctionBackupFilterSelfTest.java | 35 + ...ffinityFunctionExcludeNeighborsSelfTest.java | 31 + .../fair/FairAffinityFunctionNodesSelfTest.java | 245 + .../fair/FairAffinityFunctionSelfTest.java | 31 + .../GridFairAffinityFunctionNodesSelfTest.java | 245 - .../fair/GridFairAffinityFunctionSelfTest.java | 270 -- .../IgniteFairAffinityDynamicCacheSelfTest.java | 99 - ...ousAffinityFunctionBackupFilterSelfTest.java | 35 + ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 + .../RendezvousAffinityFunctionSelfTest.java | 50 + .../GridDiscoveryManagerAttributesSelfTest.java | 51 +- .../cache/CacheNearReaderUpdateTest.java | 388 ++ .../CacheSerializableTransactionsTest.java | 4295 ++++++++++++++++++ .../cache/CrossCacheTxRandomOperationsTest.java | 8 +- .../GridCacheAbstractFailoverSelfTest.java | 14 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- .../GridCacheAbstractLocalStoreSelfTest.java | 5 + .../GridCacheAbstractRemoveFailureTest.java | 94 +- .../GridCacheConcurrentTxMultiNodeTest.java | 3 - ...idCacheConfigurationConsistencySelfTest.java | 17 - .../cache/GridCacheMvccFlagsTest.java | 6 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 164 + .../processors/cache/GridCacheMvccSelfTest.java | 3 +- .../processors/cache/GridCacheTestEntryEx.java | 53 +- .../cache/IgniteCacheCreateRestartSelfTest.java | 2 + .../processors/cache/IgniteTxAbstractTest.java | 42 +- .../IgniteTxMultiThreadedAbstractTest.java | 106 +- ...IgnitePartitionedCountDownLatchSelfTest.java | 7 +- ...dCachePartitionedAffinityFilterSelfTest.java | 143 - ...onedNearDisabledTxMultiThreadedSelfTest.java | 31 + ...niteCacheClientNodeChangingTopologyTest.java | 170 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 3 + .../IgniteCacheCrossCacheTxFailoverTest.java | 19 + .../dht/IgniteCacheLockFailoverSelfTest.java | 11 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 6 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 184 - .../near/GridCacheNearTxExceptionSelfTest.java | 1 + ...CachePartitionedTxMultiThreadedSelfTest.java | 15 +- ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 - ...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 + ...tedFairAffinityMultiNodeFullApiSelfTest.java | 35 + ...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 + ...dezvousAffinityMultiNodeFullApiSelfTest.java | 36 + .../DataStreamerUpdateAfterLoadTest.java | 184 + .../loadtests/hashmap/GridHashMapLoadTest.java | 6 +- .../inmemory/GridTestSwapSpaceSpi.java | 8 + .../ignite/testframework/GridTestUtils.java | 19 +- .../junits/common/GridCommonAbstractTest.java | 19 +- .../IgniteCacheFullApiSelfTestSuite.java | 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 20 +- .../testsuites/IgniteCacheTestSuite2.java | 14 +- .../testsuites/IgniteCacheTestSuite5.java | 40 + .../cache/IgniteCacheAbstractQuerySelfTest.java | 4 + modules/jms11/pom.xml | 9 +- .../stream/jms11/IgniteJmsStreamerTest.java | 9 +- .../apache/ignite/stream/mqtt/MqttStreamer.java | 386 +- .../stream/mqtt/IgniteMqttStreamerTest.java | 142 +- .../mqtt/IgniteMqttStreamerTestSuite.java | 4 +- .../config/benchmark-multicast.properties | 5 +- .../IgniteAccountSerializableTxBenchmark.java | 81 + .../cache/IgniteAccountTxAbstractBenchmark.java | 61 + .../cache/IgniteAccountTxBenchmark.java | 74 + .../cache/IgniteCacheAbstractBenchmark.java | 7 +- .../IgnitePutAllSerializableTxBenchmark.java | 77 + .../ignite/yardstick/cache/model/Account.java | 42 + 132 files changed, 11827 insertions(+), 3907 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a7d8865/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java index 0000000,0b32320..ef67495 mode 000000,100644..100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java @@@ -1,0 -1,97 +1,99 @@@ + /* + * 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.cache.affinity.fair; + + import java.util.concurrent.Callable; + import org.apache.ignite.IgniteCache; + import org.apache.ignite.cache.CacheAtomicityMode; + import org.apache.ignite.cache.CacheMode; + import org.apache.ignite.configuration.CacheConfiguration; + import org.apache.ignite.configuration.IgniteConfiguration; + import org.apache.ignite.internal.IgniteInternalFuture; + 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.GridTestUtils; + import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + + /** + * + */ + public class FairAffinityDynamicCacheSelfTest extends GridCommonAbstractTest { + /** */ + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + + /** */ + public FairAffinityDynamicCacheSelfTest(){ + super(false); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + TcpDiscoverySpi disco = new TcpDiscoverySpi(); + + disco.setIpFinder(IP_FINDER); + + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); + + cfg.setDiscoverySpi(disco); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + startGridsMultiThreaded(3); + } + + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + stopAllGrids(); + } + + /** + * @throws Exception If failed. + */ + public void testStartStopCache() throws Exception { ++ fail("https://issues.apache.org/jira/browse/IGNITE-647";); ++ + CacheConfiguration<Integer, Integer> cacheCfg = new CacheConfiguration<>(); + + cacheCfg.setCacheMode(CacheMode.PARTITIONED); + cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC); + cacheCfg.setBackups(1); + cacheCfg.setName("test"); + cacheCfg.setAffinity(new FairAffinityFunction()); + + final IgniteCache<Integer, Integer> cache = ignite(0).createCache(cacheCfg); + + for (int i = 0; i < 10_000; i++) + cache.put(i, i); + + IgniteInternalFuture<Object> destFut = GridTestUtils.runAsync(new Callable<Object>() { + @Override public Object call() throws Exception { + ignite(0).destroyCache(cache.getName()); + + return null; + } + }); + + destFut.get(2000L); + } + }
