You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/10/29 07:27:08 UTC
[1/7] ignite git commit: Ignite JMS 1.1 Streamer tests: Remove
dependency on KahaDB & persistence.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 8edd9dd55 -> 4ae73f0b6
Ignite JMS 1.1 Streamer tests: Remove dependency on KahaDB & persistence.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f0b3fce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f0b3fce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f0b3fce
Branch: refs/heads/ignite-1537
Commit: 7f0b3fce5ae6ed0652f3dbf64f0482e63d36c38d
Parents: e769c3a
Author: Raul Kripalani <ra...@apache.org>
Authored: Wed Oct 28 12:37:38 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Wed Oct 28 12:37:38 2015 +0000
----------------------------------------------------------------------
modules/jms11/pom.xml | 7 -------
.../apache/ignite/stream/jms11/IgniteJmsStreamerTest.java | 9 +++++++--
2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7f0b3fce/modules/jms11/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jms11/pom.xml b/modules/jms11/pom.xml
index 72a643b..3c37e7f 100644
--- a/modules/jms11/pom.xml
+++ b/modules/jms11/pom.xml
@@ -66,13 +66,6 @@
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- <version>${activemq.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/ignite/blob/7f0b3fce/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java
----------------------------------------------------------------------
diff --git a/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java b/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java
index 0e110a5..238d939 100644
--- a/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java
+++ b/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java
@@ -83,14 +83,19 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest {
grid().<Integer, String>getOrCreateCache(defaultCacheConfiguration());
broker = new BrokerService();
- broker.deleteAllMessages();
+ broker.setDeleteAllMessagesOnStartup(true);
broker.setPersistent(false);
+ broker.setPersistenceAdapter(null);
+ broker.setPersistenceFactory(null);
PolicyMap policyMap = new PolicyMap();
PolicyEntry policy = new PolicyEntry();
+
policy.setQueuePrefetch(1);
+
broker.setDestinationPolicy(policyMap);
broker.getDestinationPolicy().setDefaultEntry(policy);
+ broker.setSchedulerSupport(false);
broker.start(true);
@@ -102,8 +107,8 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest {
public void afterTest() throws Exception {
grid().cache(null).clear();
- broker.deleteAllMessages();
broker.stop();
+ broker.deleteAllMessages();
}
public void testQueueFromName() throws Exception {
[2/7] ignite git commit: testUseDefaultSuid fixed
Posted by sb...@apache.org.
testUseDefaultSuid fixed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c39b6d43
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c39b6d43
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c39b6d43
Branch: refs/heads/ignite-1537
Commit: c39b6d43d61c9aab3dcd3240537a487c2e4605ad
Parents: 7f0b3fc
Author: agura <ag...@gridgain.com>
Authored: Wed Oct 28 15:57:10 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Wed Oct 28 15:57:10 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 69 ++++++++++----------
.../GridDiscoveryManagerAttributesSelfTest.java | 23 ++++---
2 files changed, 50 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c39b6d43/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 0865119..4820a93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -17,6 +17,38 @@
package org.apache.ignite.internal;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Timer;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.management.JMException;
+import javax.management.ObjectName;
import org.apache.ignite.IgniteAtomicLong;
import org.apache.ignite.IgniteAtomicReference;
import org.apache.ignite.IgniteAtomicSequence;
@@ -135,42 +167,10 @@ import org.apache.ignite.spi.IgniteSpi;
import org.apache.ignite.spi.IgniteSpiVersionCheckException;
import org.jetbrains.annotations.Nullable;
-import javax.management.JMException;
-import javax.management.ObjectName;
-import java.io.Externalizable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Timer;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_STARVATION_CHECK_INTERVAL;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_SUCCESS_FILE;
@@ -1268,7 +1268,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
add(ATTR_BUILD_VER, VER_STR);
add(ATTR_BUILD_DATE, BUILD_TSTAMP_STR);
add(ATTR_MARSHALLER, cfg.getMarshaller().getClass().getName());
- add(ATTR_MARSHALLER_USE_DFLT_SUID, OptimizedMarshaller.USE_DFLT_SUID);
+ add(ATTR_MARSHALLER_USE_DFLT_SUID,
+ getBoolean(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID, OptimizedMarshaller.USE_DFLT_SUID));
add(ATTR_USER_NAME, System.getProperty("user.name"));
add(ATTR_GRID_NAME, gridName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c39b6d43/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index 6e2c635..3a2f3ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -25,9 +25,9 @@ import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
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;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
import static org.apache.ignite.configuration.DeploymentMode.SHARED;
@@ -121,22 +121,29 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA
* @throws Exception If failed.
*/
public void testUseDefaultSuid() throws Exception {
- doTestUseDefaultSuid(true, false, true);
- doTestUseDefaultSuid(false, true, true);
- doTestUseDefaultSuid(true, true, false);
- doTestUseDefaultSuid(false, false, false);
+ try {
+ doTestUseDefaultSuid(Boolean.TRUE.toString(), Boolean.FALSE.toString(), true);
+ doTestUseDefaultSuid(Boolean.FALSE.toString(), Boolean.TRUE.toString(), true);
+
+ doTestUseDefaultSuid(Boolean.TRUE.toString(), Boolean.TRUE.toString(), false);
+ doTestUseDefaultSuid(Boolean.FALSE.toString(), Boolean.FALSE.toString(), false);
+ }
+ finally {
+ System.setProperty(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID,
+ String.valueOf(OptimizedMarshaller.USE_DFLT_SUID));
+ }
}
/**
* @throws Exception If failed.
*/
- private void doTestUseDefaultSuid(Boolean first, Boolean second, boolean fail) throws Exception {
+ private void doTestUseDefaultSuid(String first, String second, boolean fail) throws Exception {
try {
- GridTestUtils.setFieldValue(null, OptimizedMarshaller.class, "USE_DFLT_SUID", first);
+ System.setProperty(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID, first);
startGrid(0);
- GridTestUtils.setFieldValue(null, OptimizedMarshaller.class, "USE_DFLT_SUID", second);
+ System.setProperty(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID, second);
try {
startGrid(1);
[6/7] ignite git commit: Disabled hanging test (IGNITE-647).
Posted by sb...@apache.org.
Disabled hanging test (IGNITE-647).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/303def35
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/303def35
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/303def35
Branch: refs/heads/ignite-1537
Commit: 303def3595bce137d80c5859bf4615eece69433a
Parents: 215b0cd
Author: sboikov <sb...@gridgain.com>
Authored: Thu Oct 29 09:24:07 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Oct 29 09:24:07 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CrossCacheTxRandomOperationsTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/303def35/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
index 2577d93..d88f12f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
@@ -126,6 +126,8 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testCrossCacheTxOperationsFairAffinity() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-647");
+
txOperations(PARTITIONED, FULL_SYNC, true, true);
}
[3/7] ignite git commit: Muted test
Posted by sb...@apache.org.
Muted test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a5d50a60
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a5d50a60
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a5d50a60
Branch: refs/heads/ignite-1537
Commit: a5d50a60025559435673a066d61799d1aafe3b29
Parents: df931bd
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Oct 28 17:10:55 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Oct 28 17:10:55 2015 +0300
----------------------------------------------------------------------
.../affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a5d50a60/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
index eb1c455..f95265d 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/IgniteFairAffinityDynamicCacheSelfTest.java
@@ -71,6 +71,8 @@ public class IgniteFairAffinityDynamicCacheSelfTest extends GridCommonAbstractTe
* @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);
[5/7] ignite git commit: Fixed test.
Posted by sb...@apache.org.
Fixed test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/215b0cd9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/215b0cd9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/215b0cd9
Branch: refs/heads/ignite-1537
Commit: 215b0cd9cac7d67fb5609058f8270e6bc38c8f76
Parents: 2a7d886
Author: sboikov <sb...@gridgain.com>
Authored: Wed Oct 28 17:25:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Oct 28 17:25:10 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheSerializableTransactionsTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/215b0cd9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
----------------------------------------------------------------------
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 70ddfa0..8c135ad 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
@@ -177,6 +177,8 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
try {
IgniteCache<Integer, Integer> cache = ignite0.createCache(ccfg);
+ awaitPartitionMapExchange();
+
List<Integer> keys = testKeys(cache);
for (Integer key : keys)
[7/7] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1537
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ae73f0b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ae73f0b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ae73f0b
Branch: refs/heads/ignite-1537
Commit: 4ae73f0b611630d6192ef643ab34af86d113f365
Parents: 8edd9dd 303def3
Author: sboikov <sb...@gridgain.com>
Authored: Thu Oct 29 09:26:32 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Oct 29 09:26:32 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 69 ++++++++++----------
.../fair/FairAffinityDynamicCacheSelfTest.java | 2 +
.../GridDiscoveryManagerAttributesSelfTest.java | 23 ++++---
.../CacheSerializableTransactionsTest.java | 2 +
.../cache/CrossCacheTxRandomOperationsTest.java | 2 +
modules/jms11/pom.xml | 7 --
.../stream/jms11/IgniteJmsStreamerTest.java | 9 ++-
7 files changed, 63 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
[4/7] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by sb...@apache.org.
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-1537
Commit: 2a7d886553a967b330342d7b6734a256ce890946
Parents: a5d50a6 c39b6d4
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Oct 28 17:11:30 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
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);
+ }
+ }