You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/05/18 17:38:17 UTC
[1/4] incubator-ignite git commit: # IGNITE-709 Refactoring: extract
GridCommonAbstractTest.createClientDiscovery() method.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_2 5c8591c3f -> feee7d421
# IGNITE-709 Refactoring: extract GridCommonAbstractTest.createClientDiscovery() method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9bbc1fe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9bbc1fe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9bbc1fe9
Branch: refs/heads/ignite-709_2
Commit: 9bbc1fe921482654700137ea6153f2b4206ef9de
Parents: 5c8591c
Author: sevdokimov <se...@gridgain.com>
Authored: Mon May 18 14:17:13 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon May 18 14:17:13 2015 +0300
----------------------------------------------------------------------
.../IgniteClientDataStructuresAbstractTest.java | 19 ++----------
...ientModesTcpClientDiscoveryAbstractTest.java | 21 ++-----------
...pClientDiscoveryMarshallerCheckSelfTest.java | 18 +-----------
.../tcp/TcpDiscoveryConcurrentStartTest.java | 20 ++-----------
.../junits/common/GridCommonAbstractTest.java | 31 ++++++++++++++++++++
5 files changed, 38 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bbc1fe9/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 8aef0a6..36f1910 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
@@ -20,7 +20,6 @@ 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.*;
@@ -28,7 +27,6 @@ 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.*;
/**
@@ -50,21 +48,8 @@ public abstract class IgniteClientDataStructuresAbstractTest extends GridCommonA
if (gridName.equals(getTestGridName(NODE_CNT - 1))) {
cfg.setClientMode(true);
- if (clientDiscovery()) {
- TcpDiscoveryVmIpFinder clientFinder = new TcpDiscoveryVmIpFinder();
-
- String firstSrvAddr = F.first(ipFinder.getRegisteredAddresses()).toString();
-
- if (firstSrvAddr.startsWith("/"))
- firstSrvAddr = firstSrvAddr.substring(1);
-
- clientFinder.setAddresses(Collections.singletonList(firstSrvAddr));
-
- TcpClientDiscoverySpi discoverySpi = new TcpClientDiscoverySpi();
- discoverySpi.setIpFinder(clientFinder);
-
- cfg.setDiscoverySpi(discoverySpi);
- }
+ if (clientDiscovery())
+ cfg.setDiscoverySpi(createClientDiscovery(ipFinder));
}
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bbc1fe9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
index d24afed..127c150 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
@@ -19,11 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-
-import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
@@ -41,21 +37,8 @@ public abstract class GridCacheClientModesTcpClientDiscoveryAbstractTest extends
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- if (cfg.isClientMode() != null && cfg.isClientMode()) {
- TcpDiscoveryVmIpFinder clientFinder = new TcpDiscoveryVmIpFinder();
-
- String firstSrvAddr = F.first(ipFinder.getRegisteredAddresses()).toString();
-
- if (firstSrvAddr.startsWith("/"))
- firstSrvAddr = firstSrvAddr.substring(1);
-
- clientFinder.setAddresses(Collections.singletonList(firstSrvAddr));
-
- TcpClientDiscoverySpi discoverySpi = new TcpClientDiscoverySpi();
- discoverySpi.setIpFinder(clientFinder);
-
- cfg.setDiscoverySpi(discoverySpi);
- }
+ if (cfg.isClientMode() != null && cfg.isClientMode())
+ cfg.setDiscoverySpi(createClientDiscovery(ipFinder));
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bbc1fe9/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java
index fa63e3c..78435fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.marshaller.jdk.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.spi.*;
@@ -27,8 +26,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
-import java.util.*;
-
/**
* Test for {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}.
*/
@@ -52,20 +49,7 @@ public class TcpClientDiscoveryMarshallerCheckSelfTest extends GridCommonAbstrac
cfg.setMarshaller(new JdkMarshaller());
}
else {
- TcpClientDiscoverySpi disco = new TcpClientDiscoverySpi();
-
- TcpDiscoveryVmIpFinder clientIpFinder = new TcpDiscoveryVmIpFinder();
-
- String addr = F.first(ipFinder.getRegisteredAddresses()).toString();
-
- if (addr.startsWith("/"))
- addr = addr.substring(1);
-
- clientIpFinder.setAddresses(Collections.singleton(addr));
-
- disco.setIpFinder(clientIpFinder);
-
- cfg.setDiscoverySpi(disco);
+ cfg.setDiscoverySpi(createClientDiscovery(ipFinder));
cfg.setMarshaller(new OptimizedMarshaller());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bbc1fe9/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
index b5d02f0..f79c24b 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
@@ -22,8 +22,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
-import java.util.*;
-
/**
* Test for {@link TcpDiscoverySpi}.
*/
@@ -41,22 +39,8 @@ public class TcpDiscoveryConcurrentStartTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- if (client) {
- TcpDiscoveryVmIpFinder clientIpFinder = new TcpDiscoveryVmIpFinder();
-
- String addr = new ArrayList<>(ipFinder.getRegisteredAddresses()).iterator().next().toString();
-
- if (addr.startsWith("/"))
- addr = addr.substring(1);
-
- clientIpFinder.setAddresses(Arrays.asList(addr));
-
- TcpClientDiscoverySpi discoSpi = new TcpClientDiscoverySpi();
-
- discoSpi.setIpFinder(clientIpFinder);
-
- cfg.setDiscoverySpi(discoSpi);
- }
+ if (client)
+ cfg.setDiscoverySpi(createClientDiscovery(ipFinder));
else {
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bbc1fe9/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 3c54efe..c8a256f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -34,12 +34,16 @@ import org.apache.ignite.internal.processors.cache.local.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
+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.junits.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
import javax.cache.integration.*;
import javax.net.ssl.*;
+import java.net.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -849,6 +853,33 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
}
/**
+ * Create TcpClientDiscoverySpi configured to connect to last started server.
+ *
+ * @param srvIpFinder IpFinder that was provided to servers. Used to obtain addreses to connect.
+ */
+ protected static TcpClientDiscoverySpi createClientDiscovery(TcpDiscoveryIpFinder srvIpFinder) {
+ TcpDiscoveryVmIpFinder clientFinder = new TcpDiscoveryVmIpFinder();
+
+ Collection<InetSocketAddress> srvAddrs = srvIpFinder.getRegisteredAddresses();
+
+ if (srvAddrs.isEmpty())
+ throw new IgniteException("Failed to create client IpFinder, no server addresses registered.");
+
+ String firstSrvAddr = F.first(srvAddrs).toString();
+
+ if (firstSrvAddr.startsWith("/"))
+ firstSrvAddr = firstSrvAddr.substring(1);
+
+ clientFinder.setAddresses(Collections.singletonList(firstSrvAddr));
+
+ TcpClientDiscoverySpi res = new TcpClientDiscoverySpi();
+
+ res.setIpFinder(clientFinder);
+
+ return res;
+ }
+
+ /**
* In ATOMIC cache with CLOCK mode if key is updated from different nodes at same time
* only one update wins others are ignored (can happen in test event when updates are executed from
* different nodes sequentially), this delay is used to avoid lost updates.
[3/4] incubator-ignite git commit: # IGNITE-709 Remove duplicated
address resolving.
Posted by se...@apache.org.
# IGNITE-709 Remove duplicated address resolving.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d8f73e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d8f73e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d8f73e5
Branch: refs/heads/ignite-709_2
Commit: 0d8f73e52c87adf8e696926ce9015ff7bec498c2
Parents: f265cb6
Author: sevdokimov <se...@gridgain.com>
Authored: Mon May 18 17:40:30 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon May 18 17:40:30 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d8f73e5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 5573f51..9a0a460 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -229,13 +229,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
assertParameter(threadPri > 0, "threadPri > 0");
- try {
- locHost = U.resolveLocalHost(locAddr);
- }
- catch (IOException e) {
- throw new IgniteSpiException("Unknown local address: " + locAddr, e);
- }
-
if (log.isDebugEnabled()) {
log.debug(configInfo("localHost", locHost.getHostAddress()));
log.debug(configInfo("threadPri", threadPri));
[4/4] incubator-ignite git commit: # IGNITE-709 Add additional tests.
Posted by se...@apache.org.
# IGNITE-709 Add additional tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/feee7d42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/feee7d42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/feee7d42
Branch: refs/heads/ignite-709_2
Commit: feee7d4219963560ae9d839df3ac29812b025cab
Parents: 0d8f73e
Author: sevdokimov <se...@gridgain.com>
Authored: Mon May 18 18:38:06 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon May 18 18:38:06 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 12 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 120 +++++++++++--------
.../discovery/GridDiscoveryManagerSelfTest.java | 44 +++++--
.../tcp/TcpClientDiscoverySpiSelfTest.java | 2 -
.../testframework/junits/GridAbstractTest.java | 3 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 6 +-
7 files changed, 124 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/feee7d42/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 a89dbcc..e80272e 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
@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.*;
/**
* Base class for TCP discovery SPIs.
*/
-abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements DiscoverySpi {
+public abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements DiscoverySpi {
/** Default port to listen (value is <tt>47500</tt>). */
public static final int DFLT_PORT = 47500;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/feee7d42/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 b36c6f1..da1e1d7 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
@@ -86,7 +86,12 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
cCfg.setRebalanceMode(SYNC);
cCfg.setWriteSynchronizationMode(FULL_SYNC);
- TcpDiscoverySpi disc = new TcpDiscoverySpi();
+ TcpDiscoverySpiAdapter disc;
+
+ if (((gridName.charAt(gridName.length() - 1) - '0') & 1) == 0)
+ disc = new TcpDiscoverySpi();
+ else
+ disc = new TcpClientDiscoverySpi();
disc.setIpFinder(IP_FINDER);
@@ -148,7 +153,12 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
*/
@SuppressWarnings("BusyWait")
private void awaitDiscovery(long nodesCnt) throws InterruptedException {
+ Thread.sleep(50);
+
for (Ignite g : alive) {
+ if (g.configuration().getDiscoverySpi() instanceof TcpClientDiscoverySpi)
+ ((TcpClientDiscoverySpi)g.configuration().getDiscoverySpi()).waitForMessagePrecessed();
+
while (g.cluster().nodes().size() != nodesCnt)
Thread.sleep(10);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/feee7d42/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 538ea39..77e6d52 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
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.managers.discovery;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -29,7 +30,7 @@ import static org.apache.ignite.configuration.DeploymentMode.*;
/**
* Tests for node attributes consistency checks.
*/
-public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTest {
+public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTest {
/** */
private static final String PREFER_IPV4 = "java.net.preferIPv4Stack";
@@ -46,18 +47,34 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- TcpDiscoverySpi disc = new TcpDiscoverySpi();
-
- disc.setIpFinder(IP_FINDER);
+ if (gridName.equals(getTestGridName(1)))
+ cfg.setClientMode(true);
cfg.setIncludeProperties(PREFER_IPV4);
cfg.setDeploymentMode(mode);
cfg.setPeerClassLoadingEnabled(p2pEnabled);
- cfg.setDiscoverySpi(disc);
+ cfg.setDiscoverySpi(createDiscovery(cfg));
return cfg;
}
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+ }
+
+ /**
+ * @return Discovery SPI.
+ * @param cfg DiscoverySpi
+ */
+ protected DiscoverySpi createDiscovery(IgniteConfiguration cfg) {
+ TcpDiscoverySpi disc = new TcpDiscoverySpi();
+
+ disc.setIpFinder(IP_FINDER);
+
+ return disc;
+ }
+
/**
* @throws Exception If failed.
*/
@@ -83,44 +100,34 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testPreferIpV4StackDifferentValues() throws Exception {
- try {
- System.setProperty(PREFER_IPV4, "true");
+ System.setProperty(PREFER_IPV4, "true");
- for (int i = 0; i < 2; i++) {
- Ignite g = startGrid(i);
+ for (int i = 0; i < 2; i++) {
+ Ignite g = startGrid(i);
- assert "true".equals(g.cluster().localNode().attribute(PREFER_IPV4));
- }
+ assert "true".equals(g.cluster().localNode().attribute(PREFER_IPV4));
+ }
- System.setProperty(PREFER_IPV4, "false");
+ System.setProperty(PREFER_IPV4, "false");
- startGrid(2);
- }
- finally {
- stopAllGrids();
- }
+ startGrid(2);
}
/**
* @throws Exception If failed.
*/
public void testDifferentDeploymentModes() throws Exception {
- try {
- startGrid(1);
+ startGrid(0);
- mode = CONTINUOUS;
+ mode = CONTINUOUS;
- try {
- startGrid(2);
+ try {
+ startGrid(1);
- fail();
- }
- catch (IgniteCheckedException e) {
- assertTrue(e.getCause().getMessage().startsWith("Remote node has deployment mode different from"));
- }
+ fail();
}
- finally {
- stopAllGrids();
+ catch (IgniteCheckedException e) {
+ assertTrue(e.getCause().getMessage().startsWith("Remote node has deployment mode different from"));
}
}
@@ -128,23 +135,18 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testDifferentPeerClassLoadingEnabledFlag() throws Exception {
- try {
- startGrid(1);
+ startGrid(0);
- p2pEnabled = true;
+ p2pEnabled = true;
- try {
- startGrid(2);
+ try {
+ startGrid(1);
- fail();
- }
- catch (IgniteCheckedException e) {
- assertTrue(e.getCause().getMessage().startsWith("Remote node has peer class loading enabled flag " +
- "different from"));
- }
+ fail();
}
- finally {
- stopAllGrids();
+ catch (IgniteCheckedException e) {
+ assertTrue(e.getCause().getMessage().startsWith("Remote node has peer class loading enabled flag " +
+ "different from"));
}
}
@@ -153,19 +155,35 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
private void testPreferIpV4Stack(boolean preferIpV4) throws Exception {
- try {
- String val = String.valueOf(preferIpV4);
+ String val = String.valueOf(preferIpV4);
- System.setProperty(PREFER_IPV4, val);
+ System.setProperty(PREFER_IPV4, val);
- for (int i = 0; i < 2; i++) {
- Ignite g = startGrid(i);
+ for (int i = 0; i < 2; i++) {
+ Ignite g = startGrid(i);
- assert val.equals(g.cluster().localNode().attribute(PREFER_IPV4));
- }
+ assert val.equals(g.cluster().localNode().attribute(PREFER_IPV4));
}
- finally {
- stopAllGrids();
+ }
+
+ /**
+ *
+ */
+ public static class RegularDiscovery extends GridDiscoveryManagerAttributesSelfTest {
+ // No-op.
+ }
+
+ /**
+ *
+ */
+ public static class ClientDiscovery extends GridDiscoveryManagerAttributesSelfTest {
+ /** {@inheritDoc}
+ * @param cfg*/
+ @Override protected DiscoverySpi createDiscovery(IgniteConfiguration cfg) {
+ if (Boolean.TRUE.equals(cfg.isClientMode()))
+ return createClientDiscovery(IP_FINDER);
+
+ return super.createDiscovery(cfg);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/feee7d42/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
index be5b9c6..2fdc084 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -33,7 +34,7 @@ import static org.apache.ignite.cache.CacheMode.*;
/**
*
*/
-public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
+public abstract class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
/** */
private static final String CACHE_NAME = "cache";
@@ -50,12 +51,6 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- TcpDiscoverySpi disc = new TcpDiscoverySpi();
-
- disc.setIpFinder(IP_FINDER);
-
- cfg.setDiscoverySpi(disc);
-
CacheConfiguration ccfg1 = defaultCacheConfiguration();
ccfg1.setName(CACHE_NAME);
@@ -76,10 +71,24 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
cfg.setCacheConfiguration(ccfg1, ccfg2);
}
+ cfg.setDiscoverySpi(createDiscovery(cfg));
+
return cfg;
}
/**
+ * @return Discovery SPI.
+ * @param cfg DiscoverySpi
+ */
+ protected DiscoverySpi createDiscovery(IgniteConfiguration cfg) {
+ TcpDiscoverySpi disc = new TcpDiscoverySpi();
+
+ disc.setIpFinder(IP_FINDER);
+
+ return disc;
+ }
+
+ /**
* @throws Exception If failed.
*/
public void testHasNearCache() throws Exception {
@@ -187,4 +196,25 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
assertTrue(g0.context().discovery().hasNearCache(null, four));
assertFalse(g0.context().discovery().hasNearCache(null, five));
}
+
+ /**
+ *
+ */
+ public static class RegularDiscovery extends GridDiscoveryManagerSelfTest {
+ // No-op.
+ }
+
+ /**
+ *
+ */
+ public static class ClientDiscovery extends GridDiscoveryManagerSelfTest {
+ /** {@inheritDoc}
+ * @param cfg*/
+ @Override protected DiscoverySpi createDiscovery(IgniteConfiguration cfg) {
+ if (Boolean.TRUE.equals(cfg.isClientMode()))
+ return createClientDiscovery(IP_FINDER);
+
+ return super.createDiscovery(cfg);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/feee7d42/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index ba8200e..d534d6a 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -102,8 +102,6 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setLocalHost("127.0.0.1");
-
if (gridName.startsWith("server")) {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/feee7d42/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 37a5dc5..dd7073d 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -676,7 +676,8 @@ public abstract class GridAbstractTest extends TestCase {
protected IgniteConfiguration optimize(IgniteConfiguration cfg) throws IgniteCheckedException {
// TODO: IGNITE-605: propose another way to avoid network overhead in tests.
if (cfg.getLocalHost() == null) {
- if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpi)
+ if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpi
+ || cfg.getDiscoverySpi() instanceof TcpClientDiscoverySpi)
cfg.setLocalHost("127.0.0.1");
else
cfg.setLocalHost(getTestResources().getLocalHost());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/feee7d42/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
index 20c32b2..f0080d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
@@ -55,9 +55,11 @@ public class IgniteKernalSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheMessageSelfTest.class);
suite.addTestSuite(GridDeploymentManagerStopSelfTest.class);
suite.addTestSuite(GridManagerStopSelfTest.class);
- suite.addTestSuite(GridDiscoveryManagerAttributesSelfTest.class);
+ suite.addTestSuite(GridDiscoveryManagerAttributesSelfTest.RegularDiscovery.class);
+ suite.addTestSuite(GridDiscoveryManagerAttributesSelfTest.ClientDiscovery.class);
suite.addTestSuite(GridDiscoveryManagerAliveCacheSelfTest.class);
- suite.addTestSuite(GridDiscoveryManagerSelfTest.class);
+ suite.addTestSuite(GridDiscoveryManagerSelfTest.RegularDiscovery.class);
+ suite.addTestSuite(GridDiscoveryManagerSelfTest.ClientDiscovery.class);
suite.addTestSuite(GridDiscoveryEventSelfTest.class);
suite.addTestSuite(GridPortProcessorSelfTest.class);
suite.addTestSuite(GridHomePathSelfTest.class);
[2/4] incubator-ignite git commit: # IGNITE-709 Bug fix: check
(joinTimeout > 0)
Posted by se...@apache.org.
# IGNITE-709 Bug fix: check (joinTimeout > 0)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f265cb68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f265cb68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f265cb68
Branch: refs/heads/ignite-709_2
Commit: f265cb68d108d5b3617f5d6f893f477ca2308bff
Parents: 9bbc1fe
Author: sevdokimov <se...@gridgain.com>
Authored: Mon May 18 17:14:23 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon May 18 17:14:23 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 4 ++--
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f265cb68/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 6062ce5..5573f51 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -507,7 +507,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
else {
U.warn(log, "No addresses registered in the IP finder (will retry in 2000ms): " + ipFinder);
- if ((U.currentTimeMillis() - startTime) > joinTimeout)
+ if (joinTimeout > 0 && (U.currentTimeMillis() - startTime) > joinTimeout)
return null;
Thread.sleep(2000);
@@ -581,7 +581,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
U.warn(log, "Failed to connect to any address from IP finder (will retry to join topology " +
"in 2000ms): " + addrs0);
- if ((U.currentTimeMillis() - startTime) > joinTimeout)
+ if (joinTimeout > 0 && (U.currentTimeMillis() - startTime) > joinTimeout)
return null;
Thread.sleep(2000);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f265cb68/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 3c3b984..a89dbcc 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
@@ -150,7 +150,6 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
assertParameter(netTimeout > 0, "networkTimeout > 0");
assertParameter(sockTimeout > 0, "sockTimeout > 0");
assertParameter(ackTimeout > 0, "ackTimeout > 0");
- assertParameter(joinTimeout >= 0, "joinTimeout >= 0");
}
/**