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/01 11:05:45 UTC
[01/15] ignite git commit: Test fix
Repository: ignite
Updated Branches:
refs/heads/ignite-1534-1 638decbaf -> e250c7f5c
Test fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1282f8b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1282f8b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1282f8b1
Branch: refs/heads/ignite-1534-1
Commit: 1282f8b1ddc248e562ecb937bce84acabb8198f7
Parents: 273f291
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 15:16:31 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 15:16:31 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheP2pUnmarshallingErrorTest.java | 7 +++++++
.../IgniteCacheP2pUnmarshallingRebalanceErrorTest.java | 12 ++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1282f8b1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
index b62cc48..1b2b84d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.util.typedef.X;
@@ -76,6 +77,12 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTes
cfg.setCacheConfiguration();
}
+ if (getTestGridName(10).equals(gridName)) {
+
+ CacheConfiguration cc = cfg.getCacheConfiguration()[0];
+ cc.setRebalanceDelay(-1);
+ }
+
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1282f8b1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
index 9faeac8..73388fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
@@ -52,20 +52,20 @@ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest extends IgniteCacheP2
readCnt.set(Integer.MAX_VALUE);
- for (int i = 0; i <= 1000; i++)
+ for (int i = 0; i <= 100; i++)
jcache(0).put(new TestKey(String.valueOf(++key)), "");
- startGrid(3);
+ startGrid(10); //custom rebalanceDelay set at cfg.
- Affinity<Object> aff = affinity(grid(3).cache(null));
+ Affinity<Object> aff = affinity(grid(10).cache(null));
- while (!aff.isPrimary(grid(3).localNode(), new TestKey(String.valueOf(key))))
+ while (!aff.isPrimary(grid(10).localNode(), new TestKey(String.valueOf(key))))
--key;
readCnt.set(1);
try {
- jcache(3).get(new TestKey(String.valueOf(key)));
+ jcache(10).get(new TestKey(String.valueOf(key)));
assert false : "p2p marshalling failed, but error response was not sent";
}
@@ -73,4 +73,4 @@ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest extends IgniteCacheP2
assert X.hasCause(e, IOException.class);
}
}
-}
\ No newline at end of file
+}
[05/15] 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/52600f30
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52600f30
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52600f30
Branch: refs/heads/ignite-1534-1
Commit: 52600f30dca8397f417a53611231d1ad3e66454b
Parents: 7571f21 de39fbf
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 15:44:07 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 15:44:07 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[08/15] ignite git commit:
https://issues.apache.org/jira/browse/IGNITE-1584
Posted by sb...@apache.org.
https://issues.apache.org/jira/browse/IGNITE-1584
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3de0e475
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3de0e475
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3de0e475
Branch: refs/heads/ignite-1534-1
Commit: 3de0e475ce7d889fd565f9be2c18a72cafc86430
Parents: bada5c7
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 17:25:46 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 17:25:46 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheAtomicPutAllFailoverSelfTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3de0e475/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
index 1feafe4..b3464b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
@@ -29,4 +29,8 @@ public class IgniteCacheAtomicPutAllFailoverSelfTest extends GridCachePutAllFail
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
+
+ @Override public void testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapTieredSwap(){
+ fail("https://issues.apache.org/jira/browse/IGNITE-1584");
+ }
}
\ No newline at end of file
[09/15] ignite git commit:
https://issues.apache.org/jira/browse/IGNITE-1584
Posted by sb...@apache.org.
https://issues.apache.org/jira/browse/IGNITE-1584
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d3f04ff8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d3f04ff8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d3f04ff8
Branch: refs/heads/ignite-1534-1
Commit: d3f04ff8a20949125d907fbc781c539bc81c924c
Parents: 3de0e47
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 17:28:28 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 17:28:28 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/IgniteCacheAtomicNodeRestartTest.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d3f04ff8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index dc83ab9..327db0e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -30,4 +30,12 @@ public class IgniteCacheAtomicNodeRestartTest extends GridCachePartitionedNodeRe
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
+
+ @Override public void testRestartWithPutFourNodesNoBackups() {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1587");
+ }
+
+ @Override public void testRestartWithPutFourNodesOneBackupsOffheapTiered() {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1587");
+ }
}
\ No newline at end of file
[12/15] ignite git commit: Test Failed
Posted by sb...@apache.org.
Test Failed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b962a915
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b962a915
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b962a915
Branch: refs/heads/ignite-1534-1
Commit: b962a91582f6d6459fad24a9529bbe692eba20ca
Parents: aa9d23e
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 18:58:33 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 18:58:33 2015 +0300
----------------------------------------------------------------------
.../GridCachePartitionedOffHeapValuesQueueApiSelfTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b962a915/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
index 78e0214..d46f684 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
@@ -28,4 +28,8 @@ public class GridCachePartitionedOffHeapValuesQueueApiSelfTest extends GridCache
@Override protected CacheMemoryMode collectionMemoryMode() {
return OFFHEAP_VALUES;
}
+
+ @Override public void testQueueRemoveMultithreadBounded(){
+ fail("https://issues.apache.org/jira/browse/IGNITE-1592");
+ }
}
\ No newline at end of file
[13/15] ignite git commit: Test Failed
Posted by sb...@apache.org.
Test Failed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b08e0b20
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b08e0b20
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b08e0b20
Branch: refs/heads/ignite-1534-1
Commit: b08e0b20f46fdfb4bb86b6c495e407d77873e077
Parents: b962a91
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 19:02:05 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 19:02:05 2015 +0300
----------------------------------------------------------------------
.../partitioned/GridCachePartitionedSetFailoverSelfTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b08e0b20/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
index ea1bb9b..755ac91 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
@@ -37,4 +37,8 @@ public class GridCachePartitionedSetFailoverSelfTest extends GridCacheSetFailove
@Override protected CacheMemoryMode collectionMemoryMode() {
return ONHEAP_TIERED;
}
+
+ @Override public void testNodeRestart(){
+ fail("https://issues.apache.org/jira/browse/IGNITE-1593");
+ }
}
\ No newline at end of file
[07/15] ignite git commit:
https://issues.apache.org/jira/browse/IGNITE-1582
Posted by sb...@apache.org.
https://issues.apache.org/jira/browse/IGNITE-1582
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bada5c78
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bada5c78
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bada5c78
Branch: refs/heads/ignite-1534-1
Commit: bada5c78c16c1ee7b48fa04198e4266b72392311
Parents: 67d027e
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 17:23:12 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 17:23:12 2015 +0300
----------------------------------------------------------------------
...cheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bada5c78/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
index 484de6e..8e47134 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.java
@@ -33,4 +33,8 @@ public class GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest
return cfg;
}
+
+ @Override public void testWithSkipStore(){
+ fail("https://issues.apache.org/jira/browse/IGNITE-1582");
+ }
}
\ No newline at end of file
[10/15] ignite git commit:
https://issues.apache.org/jira/browse/IGNITE-1584
Posted by sb...@apache.org.
https://issues.apache.org/jira/browse/IGNITE-1584
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdcaf9aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdcaf9aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdcaf9aa
Branch: refs/heads/ignite-1534-1
Commit: cdcaf9aa760581c80732c75311c2e0a57d29ccb4
Parents: d3f04ff
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 17:40:19 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 17:40:19 2015 +0300
----------------------------------------------------------------------
.../tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cdcaf9aa/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
index f5e77e5..bf0cbd5 100644
--- a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
+++ b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java
@@ -68,6 +68,8 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends
* @throws Exception If any error occurs.
*/
public void testGoogleComputeEngine() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1585");
+
testCloudProvider("google-compute-engine");
}
[15/15] ignite git commit: ignite-1534 Fixed races in dynamic cache
start
Posted by sb...@apache.org.
ignite-1534 Fixed races in dynamic cache start
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e250c7f5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e250c7f5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e250c7f5
Branch: refs/heads/ignite-1534-1
Commit: e250c7f5c42fcdde8c776242314963cc2e0a63b3
Parents: 2029b7b
Author: sboikov <sb...@gridgain.com>
Authored: Thu Oct 1 12:03:44 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Oct 1 12:03:44 2015 +0300
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 2 +-
.../cache/DynamicCacheDescriptor.java | 17 +++
.../GridCachePartitionExchangeManager.java | 72 +++--------
.../processors/cache/GridCacheProcessor.java | 8 +-
.../distributed/IgniteCacheCreatePutTest.java | 125 +++++++++++++++++++
.../testsuites/IgniteCacheTestSuite4.java | 2 +
6 files changed, 165 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e250c7f5/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index aec36a2..1fe45b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -550,7 +550,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
gridStartTime = getSpi().getGridStartTime();
updateTopologyVersionIfGreater(new AffinityTopologyVersion(locNode.order()),
- new DiscoCache(localNode(), getSpi().getRemoteNodes()));
+ new DiscoCache(localNode(), F.view(topSnapshot, F.remoteNodes(locNode.id()))));
startLatch.countDown();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e250c7f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
index 24df7e4..b100a31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
@@ -68,6 +68,9 @@ public class DynamicCacheDescriptor {
/** */
private AffinityTopologyVersion startTopVer;
+ /** */
+ private boolean rcvdOnDiscovery;
+
/**
* @param ctx Context.
* @param cacheCfg Cache configuration.
@@ -236,6 +239,20 @@ public class DynamicCacheDescriptor {
this.updatesAllowed = updatesAllowed;
}
+ /**
+ * @return {@code True} if received in discovery data.
+ */
+ public boolean receivedOnDiscovery() {
+ return rcvdOnDiscovery;
+ }
+
+ /**
+ * @param rcvdOnDiscovery {@code True} if received in discovery data.
+ */
+ public void receivedOnDiscovery(boolean rcvdOnDiscovery) {
+ this.rcvdOnDiscovery = rcvdOnDiscovery;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(DynamicCacheDescriptor.class, this, "cacheName", U.maskName(cacheCfg.getName()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/e250c7f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 3e77e0d..adc2174 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -105,18 +105,12 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
/** Partition resend timeout after eviction. */
private final long partResendTimeout = getLong(IGNITE_PRELOAD_RESEND_TIMEOUT, DFLT_PRELOAD_RESEND_TIMEOUT);
- /** Latch which completes after local exchange future is created. */
- private GridFutureAdapter<?> locExchFut;
-
/** */
private final ReadWriteLock busyLock = new ReentrantReadWriteLock();
/** Last partition refresh. */
private final AtomicLong lastRefresh = new AtomicLong(-1);
- /** Pending futures. */
- private final Queue<GridDhtPartitionsExchangeFuture> pendingExchangeFuts = new ConcurrentLinkedQueue<>();
-
/** */
@GridToStringInclude
private ExchangeWorker exchWorker;
@@ -229,31 +223,18 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
}
if (exchId != null) {
- // Start exchange process.
- pendingExchangeFuts.add(exchFut);
+ if (log.isDebugEnabled())
+ log.debug("Discovery event (will start exchange): " + exchId);
// Event callback - without this callback future will never complete.
exchFut.onEvent(exchId, e);
+ // Start exchange process.
+ addFuture(exchFut);
+ }
+ else {
if (log.isDebugEnabled())
- log.debug("Discovery event (will start exchange): " + exchId);
-
- locExchFut.listen(new CI1<IgniteInternalFuture<?>>() {
- @Override public void apply(IgniteInternalFuture<?> t) {
- if (!enterBusy())
- return;
-
- try {
- // Unwind in the order of discovery events.
- for (GridDhtPartitionsExchangeFuture f = pendingExchangeFuts.poll(); f != null;
- f = pendingExchangeFuts.poll())
- addFuture(f);
- }
- finally {
- leaveBusy();
- }
- }
- });
+ log.debug("Do not start exchange for discovery event: " + evt);
}
}
finally {
@@ -266,8 +247,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
@Override protected void start0() throws IgniteCheckedException {
super.start0();
- locExchFut = new GridFutureAdapter<>();
-
exchWorker = new ExchangeWorker();
cctx.gridEvents().addLocalEventListener(discoLsnr, EVT_NODE_JOINED, EVT_NODE_LEFT, EVT_NODE_FAILED,
@@ -328,12 +307,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
if (reconnect)
reconnectExchangeFut = new GridFutureAdapter<>();
- new IgniteThread(cctx.gridName(), "exchange-worker", exchWorker).start();
-
- onDiscoveryEvent(cctx.localNodeId(), fut);
+ exchWorker.futQ.addFirst(fut);
- // Allow discovery events to get processed.
- locExchFut.onDone();
+ new IgniteThread(cctx.gridName(), "exchange-worker", exchWorker).start();
if (reconnect) {
fut.listen(new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() {
@@ -382,8 +358,10 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
}
}
- for (GridCacheContext cacheCtx : cctx.cacheContexts())
- cacheCtx.preloader().onInitialExchangeComplete(null);
+ for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
+ if (cacheCtx.startTopologyVersion() == null)
+ cacheCtx.preloader().onInitialExchangeComplete(null);
+ }
if (log.isDebugEnabled())
log.debug("Finished waiting for initial exchange: " + fut.exchangeId());
@@ -414,12 +392,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
for (AffinityReadyFuture f : readyFuts.values())
f.onDone(stopErr);
- for (GridDhtPartitionsExchangeFuture f : pendingExchangeFuts)
- f.onDone(stopErr);
-
- if (locExchFut != null)
- locExchFut.onDone(stopErr);
-
U.cancel(exchWorker);
if (log.isDebugEnabled())
@@ -583,22 +555,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
}
/**
- * @param nodeId New node ID.
- * @param fut Exchange future.
- */
- void onDiscoveryEvent(UUID nodeId, GridDhtPartitionsExchangeFuture fut) {
- if (!enterBusy())
- return;
-
- try {
- addFuture(fut);
- }
- finally {
- leaveBusy();
- }
- }
-
- /**
* @param evt Discovery event.
* @return Affinity topology version.
*/
@@ -1033,7 +989,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
U.warn(log, "Pending exchange futures:");
- for (GridDhtPartitionsExchangeFuture fut : pendingExchangeFuts)
+ for (GridDhtPartitionsExchangeFuture fut : exchWorker.futQ)
U.warn(log, ">>> " + fut);
ExchangeFutureSet exchFuts = this.exchFuts;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e250c7f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 5591fa6..2dad84e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -805,7 +805,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
boolean loc = desc.locallyConfigured();
- if (loc || CU.affinityNode(locNode, filter)) {
+ if (loc || (desc.receivedOnDiscovery() && CU.affinityNode(locNode, filter))) {
CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(ccfg);
CachePluginManager pluginMgr = desc.pluginManager();
@@ -1958,7 +1958,11 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (req.initiatingNodeId() == null)
desc.staticallyConfigured(true);
- registeredCaches.put(maskNull(req.cacheName()), desc);
+ DynamicCacheDescriptor old = registeredCaches.put(maskNull(req.cacheName()), desc);
+
+ assert old == null : old;
+
+ desc.receivedOnDiscovery(true);
ctx.discovery().setCacheFilter(
req.cacheName(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/e250c7f5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
new file mode 100644
index 0000000..8b3d9d3
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.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.distributed;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+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;
+
+/**
+ *
+ */
+public class IgniteCacheCreatePutTest extends GridCommonAbstractTest {
+ /** Grid count. */
+ private static final int GRID_CNT = 3;
+
+ /** */
+ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ cfg.setPeerClassLoadingEnabled(false);
+
+ TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+ discoSpi.setIpFinder(ipFinder);
+
+ cfg.setDiscoverySpi(discoSpi);
+
+ OptimizedMarshaller marsh = new OptimizedMarshaller();
+ marsh.setRequireSerializable(false);
+
+ cfg.setMarshaller(marsh);
+
+ CacheConfiguration ccfg = new CacheConfiguration();
+
+ ccfg.setName("cache*");
+ ccfg.setCacheMode(CacheMode.PARTITIONED);
+ ccfg.setBackups(1);
+
+ cfg.setCacheConfiguration(ccfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return 3 * 60 * 1000L;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testStartNodes() throws Exception {
+ long stopTime = System.currentTimeMillis() + 2 * 60_000;
+
+ try {
+ int iter = 0;
+
+ while (System.currentTimeMillis() < stopTime) {
+ log.info("Iteration: " + iter++);
+
+ try {
+ final AtomicInteger idx = new AtomicInteger();
+
+ GridTestUtils.runMultiThreaded(new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ int node = idx.getAndIncrement();
+
+ Ignite ignite = startGrid(node);
+
+ IgniteCache<Object, Object> cache = ignite.getOrCreateCache("cache1");
+
+ assertNotNull(cache);
+
+ for (int i = 0; i < 100; i++)
+ cache.put(i, i);
+
+ return null;
+ }
+ }, GRID_CNT, "start");
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/e250c7f5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index f8c9d26..228d99c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -79,6 +79,7 @@ import org.apache.ignite.internal.processors.cache.IgniteSystemCacheOnClientTest
import org.apache.ignite.internal.processors.cache.distributed.CacheAffinityEarlyTest;
import org.apache.ignite.internal.processors.cache.distributed.CacheNoValueClassOnServerNodeTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutMultiNodeSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtTxPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheLockFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheMultiTxLockSelfTest;
@@ -205,6 +206,7 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(IgniteDynamicCacheStartNoExchangeTimeoutTest.class);
suite.addTestSuite(CacheAffinityEarlyTest.class);
suite.addTestSuite(IgniteCacheCreatePutMultiNodeSelfTest.class);
+ suite.addTestSuite(IgniteCacheCreatePutTest.class);
suite.addTestSuite(GridCacheTxLoadFromStoreOnLockSelfTest.class);
[04/15] ignite git commit: Test fix
Posted by sb...@apache.org.
Test fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7571f211
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7571f211
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7571f211
Branch: refs/heads/ignite-1534-1
Commit: 7571f211ea85854854f08b9d2cecaff9850e126d
Parents: 1282f8b
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 15:43:40 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 15:43:40 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/IgniteCrossCacheTxSelfTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7571f211/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
index bf9b1c6..dc0293e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
@@ -148,11 +148,11 @@ public class IgniteCrossCacheTxSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < TX_CNT; i++) {
int grid = ThreadLocalRandom8.current().nextInt(nodeCount());
+ IgniteCache<Integer, String> first = grid(grid).cache(FIRST_CACHE);
+ IgniteCache<Integer, String> second = grid(grid).cache(SECOND_CACHE);
+
try (Transaction tx = grid(grid).transactions().txStart(concurrency, isolation)) {
try {
- IgniteCache<Integer, String> first = grid(grid).cache(FIRST_CACHE);
- IgniteCache<Integer, String> second = grid(grid).cache(SECOND_CACHE);
-
int size = ThreadLocalRandom8.current().nextInt(24) + 1;
for (int k = 0; k < size; k++) {
[14/15] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1534-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1534-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2029b7b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2029b7b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2029b7b1
Branch: refs/heads/ignite-1534-1
Commit: 2029b7b191b348d38e7c53885929e137fdef5473
Parents: 638decb b08e0b2
Author: sboikov <sb...@gridgain.com>
Authored: Thu Oct 1 11:52:05 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Oct 1 11:52:05 2015 +0300
----------------------------------------------------------------------
.../cloud/TcpDiscoveryCloudIpFinderSelfTest.java | 2 ++
.../java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 2 ++
.../cache/IgniteCacheAtomicPutAllFailoverSelfTest.java | 4 ++++
.../cache/IgniteCacheP2pUnmarshallingErrorTest.java | 7 +++++++
.../IgniteCacheP2pUnmarshallingRebalanceErrorTest.java | 12 ++++++------
...hePartitionedAtomicQueueCreateMultiNodeSelfTest.java | 4 ++++
...idCachePartitionedOffHeapValuesQueueApiSelfTest.java | 4 ++++
.../GridCachePartitionedSetFailoverSelfTest.java | 4 ++++
.../distributed/IgniteCacheAtomicNodeRestartTest.java | 8 ++++++++
.../distributed/dht/IgniteCrossCacheTxSelfTest.java | 6 +++---
...NearEnabledFairAffinityMultiNodeFullApiSelfTest.java | 4 ++++
12 files changed, 49 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[11/15] ignite git commit: Test Failed
Posted by sb...@apache.org.
Test Failed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa9d23e8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa9d23e8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa9d23e8
Branch: refs/heads/ignite-1534-1
Commit: aa9d23e80a08d0cfb4c3fc13cb7c59bc2ceb3bee
Parents: cdcaf9a
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 18:52:33 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 18:52:33 2015 +0300
----------------------------------------------------------------------
.../GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/aa9d23e8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
index caeb9b6..cc24d7f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
@@ -37,4 +37,8 @@ public class GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest
@Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
return ATOMIC;
}
+
+ @Override public void testTx(){
+ fail("https://issues.apache.org/jira/browse/IGNITE-1591");
+ }
}
\ No newline at end of file
[03/15] 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/de39fbf2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de39fbf2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de39fbf2
Branch: refs/heads/ignite-1534-1
Commit: de39fbf269ad6f834ab01444558ea2dced1c2035
Parents: f380883 1282f8b
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Wed Sep 30 14:19:28 2015 +0200
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Wed Sep 30 14:19:28 2015 +0200
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 22 +--
.../processors/cache/GridCacheEventManager.java | 12 +-
.../processors/cache/GridCacheIoManager.java | 76 +--------
.../processors/cache/GridCacheMessage.java | 7 -
.../processors/cache/GridCacheProcessor.java | 68 +++++---
.../cache/GridCacheSharedContext.java | 32 ----
.../processors/cache/GridCacheUtils.java | 8 -
.../dht/GridDhtAffinityAssignmentRequest.java | 5 -
.../dht/GridDhtAffinityAssignmentResponse.java | 5 -
.../distributed/dht/GridDhtLockRequest.java | 5 -
.../distributed/dht/GridDhtTxFinishRequest.java | 5 -
.../dht/GridDhtTxPrepareRequest.java | 7 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 5 -
.../dht/preloader/GridDhtForceKeysResponse.java | 5 -
.../GridDhtPartitionDemandMessage.java | 5 -
.../GridDhtPartitionSupplyMessage.java | 5 -
.../GridDhtPartitionsAbstractMessage.java | 5 -
.../dht/preloader/GridDhtPreloader.java | 6 +
.../IgniteClientReconnectAbstractTest.java | 35 ++++-
.../IgniteClientReconnectCacheTest.java | 154 +++++++++++++++++++
.../IgniteCacheP2pUnmarshallingErrorTest.java | 7 +
...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +-
22 files changed, 266 insertions(+), 225 deletions(-)
----------------------------------------------------------------------
[06/15] ignite git commit:
https://issues.apache.org/jira/browse/IGNITE-1583
Posted by sb...@apache.org.
https://issues.apache.org/jira/browse/IGNITE-1583
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/67d027e5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/67d027e5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/67d027e5
Branch: refs/heads/ignite-1534-1
Commit: 67d027e518ea4bb64b7a2bc51f1327fe204a2b50
Parents: 52600f3
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 17:19:49 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 17:19:49 2015 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/67d027e5/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index e35333b..50bcc41 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -176,6 +176,8 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testAlivesClient() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1583");
+
clientMode = true;
doTestAlive();
[02/15] ignite git commit: # master - changed "ssl" to "tls/ssl"
Posted by sb...@apache.org.
# master - changed "ssl" to "tls/ssl"
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3808831
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3808831
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3808831
Branch: refs/heads/ignite-1534-1
Commit: f3808831a8df1b67b81a92f50cd2b23c3358e604
Parents: c6ec7e1
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Wed Sep 30 14:19:13 2015 +0200
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Wed Sep 30 14:19:13 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f3808831/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 68a0383..c02dc59 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
@@ -2177,7 +2177,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
assert log != null;
U.quietAndInfo(log, "Security status [authentication=" + onOff(ctx.security().enabled())
- + ", ssl=" + onOff(ctx.config().getSslContextFactory() != null) + ']');
+ + ", tls/ssl=" + onOff(ctx.config().getSslContextFactory() != null) + ']');
}
/**