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/05/14 13:58:49 UTC
[1/5] incubator-ignite git commit: # IGNITE-709 Bug fix: partition
exchange timeout occurs many times if no caches are configured.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_3 63261f586 -> 7ed0ddf29
# IGNITE-709 Bug fix: partition exchange timeout occurs many times if no caches are configured.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/816da0a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/816da0a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/816da0a8
Branch: refs/heads/ignite-709_3
Commit: 816da0a8d9fcbe3b4b9d06fa5a53e1de1698ee09
Parents: 4ba5671
Author: sevdokimov <se...@gridgain.com>
Authored: Thu May 14 13:18:34 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu May 14 13:18:34 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/816da0a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 45d332c..4b8db00 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1252,7 +1252,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
cctx.kernalContext().timeout().removeTimeoutObject(old);
GridTimeoutObject timeoutObj = new GridTimeoutObjectAdapter(
- cctx.gridConfig().getNetworkTimeout() * cctx.gridConfig().getCacheConfiguration().length) {
+ cctx.gridConfig().getNetworkTimeout() * Math.max(1, cctx.gridConfig().getCacheConfiguration().length)) {
@Override public void onTimeout() {
if (isDone())
return;
[2/5] incubator-ignite git commit: # IGNITE-709 Move spiState to
TcpDiscoverySpi.
Posted by sb...@apache.org.
# IGNITE-709 Move spiState to TcpDiscoverySpi.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb762a48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb762a48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb762a48
Branch: refs/heads/ignite-709_3
Commit: cb762a4875a6ae1b6eb358f718ac2a160fc7f186
Parents: 816da0a
Author: sevdokimov <se...@gridgain.com>
Authored: Thu May 14 13:31:31 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu May 14 13:31:31 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 3 +++
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 5 -----
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb762a48/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 10c8e9e..3f178b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -272,6 +272,9 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
/** Mutex. */
private final Object mux = new Object();
+ /** Discovery state. */
+ protected TcpDiscoverySpiState spiState = DISCONNECTED;
+
/** Map with proceeding ping requests. */
private final ConcurrentMap<InetSocketAddress, IgniteInternalFuture<IgniteBiTuple<UUID, Boolean>>> pingMap =
new ConcurrentHashMap8<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb762a48/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index ac925d2..181065d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -42,8 +42,6 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*;
-
/**
* Base class for TCP discovery SPIs.
*/
@@ -136,9 +134,6 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
/** Socket timeout worker. */
protected SocketTimeoutWorker sockTimeoutWorker;
- /** Discovery state. */
- protected TcpDiscoverySpiState spiState = DISCONNECTED;
-
/** Start time of the very first grid node. */
protected volatile long gridStartTime;
[3/5] incubator-ignite git commit: # ignite-709_3 do not create
system caches on client nodes
Posted by sb...@apache.org.
# ignite-709_3 do not create system caches on client nodes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/22ec4aae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22ec4aae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22ec4aae
Branch: refs/heads/ignite-709_3
Commit: 22ec4aae19ee53fb05c14187d0fd62e66490bffa
Parents: 63261f5
Author: sboikov <sb...@gridgain.com>
Authored: Thu May 14 14:32:52 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu May 14 14:32:52 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 18 +++-
.../cache/IgniteSystemCacheOnClientTest.java | 97 ++++++++++++++++++++
.../testsuites/IgniteCacheTestSuite4.java | 1 +
3 files changed, 115 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ec4aae/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 86d80c1..e63dd8b 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
@@ -736,7 +736,13 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (marshallerCache() == null) {
assert ctx.config().isClientMode() : "Marshaller cache is missed on server node.";
- IgniteInternalFuture<?> fut = startCacheAsync(CU.MARSH_CACHE_NAME, true);
+ DynamicCacheDescriptor desc = registeredCaches.get(CU.MARSH_CACHE_NAME);
+
+ assert desc != null && desc.cacheConfiguration() != null && desc.cacheType().equals(CacheType.MARSHALLER);
+
+ // On client node user near-only marshaller cache.
+ IgniteInternalFuture<?> fut = dynamicStartCache(desc.cacheConfiguration(),
+ CU.MARSH_CACHE_NAME, new NearCacheConfiguration(), desc.cacheType(), false);
assert fut != null;
@@ -2542,6 +2548,16 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/**
+ * @return Utility cache start future.
+ */
+ public IgniteInternalFuture<?> utilityCacheAsync() {
+ if (internalCache(CU.UTILITY_CACHE_NAME) != null)
+ return new GridFinishedFuture<>();
+
+ return startCacheAsync(CU.UTILITY_CACHE_NAME, true);
+ }
+
+ /**
* @param name Cache name.
* @param <K> type of keys.
* @param <V> type of values.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ec4aae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java
new file mode 100644
index 0000000..52ef7e2
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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;
+
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.*;
+
+/**
+ *
+ */
+public class IgniteSystemCacheOnClientTest extends GridCommonAbstractTest {
+ /** */
+ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+ if (gridName.equals(getTestGridName(1)))
+ cfg.setClientMode(true);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSystemCacheOnClientNode() throws Exception {
+ startGrids(2);
+
+ final IgniteKernal ignite = (IgniteKernal)ignite(1);
+
+ assertTrue(ignite.configuration().isClientMode());
+
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return ignite.internalCache(CU.MARSH_CACHE_NAME) != null;
+ }
+ }, 5000);
+
+ GridCacheAdapter marshCache = ignite.internalCache(CU.MARSH_CACHE_NAME);
+
+ assertNotNull(marshCache);
+
+ assertTrue("Marshaller cache on client should have near cache", marshCache.context().isNear());
+
+ marshCache = ((IgniteKernal)ignite(0)).internalCache(CU.MARSH_CACHE_NAME);
+
+ assertFalse(marshCache.context().isNear());
+
+ Collection<ClusterNode> affNodes = marshCache.affinity().mapKeyToPrimaryAndBackups(1);
+
+ assertEquals(1, affNodes.size());
+ assertTrue(affNodes.contains(ignite(0).cluster().localNode()));
+
+ GridCacheAdapter utilityCache = ((IgniteKernal)ignite(0)).internalCache(CU.UTILITY_CACHE_NAME);
+
+ affNodes = utilityCache.affinity().mapKeyToPrimaryAndBackups(1);
+
+ assertEquals(1, affNodes.size());
+ assertTrue(affNodes.contains(ignite(0).cluster().localNode()));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ec4aae/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 f7272d4..39f331c 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
@@ -125,6 +125,7 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(IgniteExchangeFutureHistoryTest.class);
suite.addTestSuite(CacheNoValueClassOnServerNodeTest.class);
+ suite.addTestSuite(IgniteSystemCacheOnClientTest.class);
return suite;
}
[4/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-709_2' into ignite-709_3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-709_3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ede1d0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ede1d0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ede1d0a
Branch: refs/heads/ignite-709_3
Commit: 1ede1d0ad9dfb707d3986d34aa4e2b188ece7129
Parents: 22ec4aa cb762a4
Author: sboikov <sb...@gridgain.com>
Authored: Thu May 14 14:42:57 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu May 14 14:42:57 2015 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 +-
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 3 +++
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 5 -----
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ede1d0a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
[5/5] incubator-ignite git commit: # ignite-709_3 do not create
system caches on client nodes
Posted by sb...@apache.org.
# ignite-709_3 do not create system caches on client nodes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ed0ddf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ed0ddf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ed0ddf2
Branch: refs/heads/ignite-709_3
Commit: 7ed0ddf29fc9baae66ca2fb9e3be960e0b7e295b
Parents: 1ede1d0
Author: sboikov <sb...@gridgain.com>
Authored: Thu May 14 14:58:39 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu May 14 14:58:39 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 21 ++++-----
.../datastructures/DataStructuresProcessor.java | 10 ++++-
.../IgniteClientDataStructuresAbstractTest.java | 47 ++++++++++++++++++++
3 files changed, 67 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ed0ddf2/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 e63dd8b..8771515 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
@@ -736,13 +736,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (marshallerCache() == null) {
assert ctx.config().isClientMode() : "Marshaller cache is missed on server node.";
- DynamicCacheDescriptor desc = registeredCaches.get(CU.MARSH_CACHE_NAME);
-
- assert desc != null && desc.cacheConfiguration() != null && desc.cacheType().equals(CacheType.MARSHALLER);
-
- // On client node user near-only marshaller cache.
- IgniteInternalFuture<?> fut = dynamicStartCache(desc.cacheConfiguration(),
- CU.MARSH_CACHE_NAME, new NearCacheConfiguration(), desc.cacheType(), false);
+ // On client node use near-only marshaller cache.
+ IgniteInternalFuture<?> fut = startCacheAsync(CU.MARSH_CACHE_NAME, new NearCacheConfiguration(), false);
assert fut != null;
@@ -2554,7 +2549,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (internalCache(CU.UTILITY_CACHE_NAME) != null)
return new GridFinishedFuture<>();
- return startCacheAsync(CU.UTILITY_CACHE_NAME, true);
+ return startCacheAsync(CU.UTILITY_CACHE_NAME, null, true);
}
/**
@@ -2634,7 +2629,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If failed.
*/
private IgniteCache startJCache(String cacheName, boolean failIfNotStarted) throws IgniteCheckedException {
- IgniteInternalFuture<?> fut = startCacheAsync(cacheName, failIfNotStarted);
+ IgniteInternalFuture<?> fut = startCacheAsync(cacheName, null, failIfNotStarted);
if (fut != null) {
fut.get();
@@ -2654,11 +2649,15 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/**
* @param cacheName Cache name.
+ * @param nearCfg Near cache configuration.
* @param failIfNotStarted If {@code true} throws {@link IllegalArgumentException} if cache is not started,
* otherwise returns {@code null} in this case.
* @return Future.
*/
- @Nullable private IgniteInternalFuture<?> startCacheAsync(String cacheName, boolean failIfNotStarted) {
+ @Nullable public IgniteInternalFuture<?> startCacheAsync(String cacheName,
+ @Nullable NearCacheConfiguration nearCfg,
+ boolean failIfNotStarted)
+ {
String masked = maskNull(cacheName);
DynamicCacheDescriptor desc = registeredCaches.get(masked);
@@ -2686,6 +2685,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
req.clientStartOnly(true);
+ req.nearCacheConfiguration(nearCfg);
+
return F.first(initiateCacheChanges(F.asList(req)));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ed0ddf2/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index b8d5bef..0a90e32 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -123,7 +123,15 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
assert utilityCache != null;
if (atomicCfg != null) {
- IgniteInternalCache atomicsCache = ctx.cache().getOrStartCache(CU.ATOMICS_CACHE_NAME);
+ IgniteInternalCache atomicsCache = ctx.cache().internalCache(CU.ATOMICS_CACHE_NAME);
+
+ if (atomicsCache == null) {
+ assert ctx.config().isClientMode() : "Atomics cache is missed on server node.";
+
+ ctx.cache().startCacheAsync(CU.ATOMICS_CACHE_NAME, new NearCacheConfiguration(), true).get();
+
+ atomicsCache = ctx.cache().internalCache(CU.ATOMICS_CACHE_NAME);
+ }
assert atomicsCache != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ed0ddf2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
index 175c1e6..db16062 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
@@ -19,13 +19,17 @@ package org.apache.ignite.internal.processors.cache.datastructures;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
+import java.util.concurrent.*;
/**
*
@@ -183,6 +187,49 @@ public abstract class IgniteClientDataStructuresAbstractTest extends GridCommonA
}
/**
+ * @throws Exception If failed.
+ */
+ public void testLatch() throws Exception {
+ Ignite clientNode = clientIgnite();
+
+ final Ignite srvNode = serverNode();
+
+ assertNull(clientNode.countDownLatch("latch1", 1, true, false));
+
+ try (IgniteCountDownLatch latch = clientNode.countDownLatch("latch1", 1, true, true)) {
+ assertNotNull(latch);
+
+ assertEquals(1, latch.count());
+
+ IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ U.sleep(1000);
+
+ IgniteCountDownLatch latch0 = srvNode.countDownLatch("latch1", 1, true, false);
+
+ assertEquals(1, latch0.count());
+
+ log.info("Count down latch.");
+
+ latch0.countDown();
+
+ assertEquals(0, latch0.count());
+
+ return null;
+ }
+ });
+
+ log.info("Await latch.");
+
+ assertTrue(latch.await(5000, TimeUnit.MILLISECONDS));
+
+ log.info("Finished wait.");
+
+ fut.get();
+ }
+ }
+
+ /**
* @return Client node.
*/
private Ignite clientIgnite() {