This is an automated email from the ASF dual-hosted git repository.
dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 3b0ac22 IGNITE-12179 Fixes tests - #6878. - *.testTtlNoTx -
TcpCommunicationSpiFreezingClientTest -
TcpCommunicationSpiFaultyClientSslTest.testNotAcceptedConnection -
testCacheIdleVerifyPrintLostPartitions
3b0ac22 is described below
commit 3b0ac22c43b969e7e7510c27a686b94fa1e31d3d
Author: Anton Kalashnikov <kaa....@yandex.ru>
AuthorDate: Fri Sep 20 11:20:31 2019 +0300
IGNITE-12179 Fixes tests - #6878.
- *.testTtlNoTx
- TcpCommunicationSpiFreezingClientTest
- TcpCommunicationSpiFaultyClientSslTest.testNotAcceptedConnection
- testCacheIdleVerifyPrintLostPartitions
Signed-off-by: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
---
.../internal/commandline/CommandHandler.java | 59 ++++++++++++++++++++--
.../cache/GridCacheAbstractFullApiSelfTest.java | 20 ++++----
.../tcp/TcpCommunicationSpiFaultyClientTest.java | 35 ++++++++++++-
.../tcp/TcpCommunicationSpiFreezingClientTest.java | 4 +-
.../ignite/util/GridCommandHandlerSslTest.java | 24 +++++++++
5 files changed, 125 insertions(+), 17 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index 591f75e..cd474db 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -305,10 +305,16 @@ public class CommandHandler {
if (isConnectionError(e)) {
IgniteCheckedException cause = X.cause(e,
IgniteCheckedException.class);
- if (cause != null && cause.getMessage() != null &&
cause.getMessage().contains("SSL"))
- e = cause;
+ if (isConnectionClosedSilentlyException(e))
+ logger.severe("Connection to cluster failed. Please check
firewall settings and " +
+ "client and server are using the same SSL
configuration.");
+ else {
+ if (isSSLMisconfigurationError(cause))
+ e = cause;
- logger.severe("Connection to cluster failed. " +
CommandLogger.errorMessage(e));
+ logger.severe("Connection to cluster failed. " +
CommandLogger.errorMessage(e));
+
+ }
logger.info("Command [" + commandName + "] finished with code:
" + EXIT_CODE_CONNECTION_FAILED);
@@ -344,6 +350,53 @@ public class CommandHandler {
}
/**
+ * Analyses passed exception to find out whether it is related to SSL
misconfiguration issues.
+ *
+ * (!) Implementation depends heavily on structure of exception stack trace
+ * thus is very fragile to any changes in that structure.
+ *
+ * @param e Exception to analyze.
+ *
+ * @return {@code True} if exception may be related to SSL
misconfiguration issues.
+ */
+ private boolean isSSLMisconfigurationError(Throwable e) {
+ return e != null && e.getMessage() != null &&
e.getMessage().contains("SSL");
+ }
+
+ /**
+ * Analyses passed exception to find out whether it is caused by server
closing connection silently.
+ * This happens when client tries to establish unprotected connection
+ * to the cluster supporting only secured communications (e.g. when server
is configured to use SSL certificates
+ * and client is not).
+ *
+ * (!) Implementation depends heavily on structure of exception stack trace
+ * thus is very fragile to any changes in that structure.
+ *
+ * @param e Exception to analyse.
+ * @return {@code True} if exception may be related to the attempt to
establish unprotected connection
+ * to secured cluster.
+ */
+ private boolean isConnectionClosedSilentlyException(Throwable e) {
+ if (!(e instanceof GridClientDisconnectedException))
+ return false;
+
+ Throwable cause = e.getCause();
+
+ if (cause == null)
+ return false;
+
+ cause = cause.getCause();
+
+ if (cause instanceof GridClientConnectionResetException &&
+ cause.getMessage() != null &&
+ cause.getMessage().contains("Failed to perform handshake")
+ )
+ return true;
+
+ return false;
+ }
+
+ /**
* Does one of three things:
* <ul>
* <li>returns user name from connection parameters if it is
there;</li>
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 2900edd..74d57d9 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -17,6 +17,15 @@
package org.apache.ignite.internal.processors.cache;
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.expiry.TouchedExpiryPolicy;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.EntryProcessorResult;
+import javax.cache.processor.MutableEntry;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
@@ -38,15 +47,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
-import javax.cache.Cache;
-import javax.cache.CacheException;
-import javax.cache.expiry.Duration;
-import javax.cache.expiry.ExpiryPolicy;
-import javax.cache.expiry.TouchedExpiryPolicy;
-import javax.cache.processor.EntryProcessor;
-import javax.cache.processor.EntryProcessorException;
-import javax.cache.processor.EntryProcessorResult;
-import javax.cache.processor.MutableEntry;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import org.apache.ignite.Ignite;
@@ -4319,7 +4319,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
* @throws Exception If failed.
*/
private void checkTtl(boolean inTx, boolean oldEntry) throws Exception {
- int ttl = 1000;
+ int ttl = 4000;
final ExpiryPolicy expiry = new TouchedExpiryPolicy(new
Duration(MILLISECONDS, ttl));
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
index 3e9ee6b..cdbe038 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.spi.communication.tcp;
import java.io.IOException;
+import java.net.BindException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.util.Collections;
@@ -60,6 +61,9 @@ public class TcpCommunicationSpiFaultyClientTest extends
GridCommonAbstractTest
}
};
+ /** Server port for {@link FakeServer}. */
+ private static int serverPort = 47200;
+
/** Client mode. */
private static boolean clientMode;
@@ -107,9 +111,29 @@ public class TcpCommunicationSpiFaultyClientTest extends
GridCommonAbstractTest
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
+ serverPort = takeFreePort();
+
System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL,
"true");
}
+ /**
+ * @throws IOException If failed.
+ */
+ private static int takeFreePort() throws IOException {
+ int freePort = serverPort;
+
+ while(true) {
+ try {
+ U.closeQuiet(startServerSocket(freePort));
+
+ return freePort;
+ }
+ catch (BindException ignore) { //If address already in use (Bind
failed) t trying to choose another one.
+ freePort++;
+ }
+ }
+ }
+
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
super.afterTestsStopped();
@@ -284,6 +308,13 @@ public class TcpCommunicationSpiFaultyClientTest extends
GridCommonAbstractTest
}
/**
+ * @throws IOException If failed.
+ */
+ private static ServerSocket startServerSocket(int port) throws IOException
{
+ return new ServerSocket(port, 50, InetAddress.getByName("127.0.0.1"));
+ }
+
+ /**
* Server that emulates connection troubles.
*/
private static class FakeServer implements Runnable {
@@ -297,7 +328,7 @@ public class TcpCommunicationSpiFaultyClientTest extends
GridCommonAbstractTest
* Default constructor.
*/
FakeServer() throws IOException {
- srv = new ServerSocket(47200, 50,
InetAddress.getByName("127.0.0.1"));
+ srv = startServerSocket(serverPort);
}
/**
@@ -336,7 +367,7 @@ public class TcpCommunicationSpiFaultyClientTest extends
GridCommonAbstractTest
Map<String, Object> attrs = new HashMap<>(node.attributes());
attrs.put(createAttributeName(ATTR_ADDRS),
Collections.singleton("127.0.0.1"));
- attrs.put(createAttributeName(ATTR_PORT), 47200);
+ attrs.put(createAttributeName(ATTR_PORT), serverPort);
attrs.put(createAttributeName(ATTR_EXT_ADDRS),
Collections.emptyList());
attrs.put(createAttributeName(ATTR_HOST_NAMES),
Collections.emptyList());
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFreezingClientTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFreezingClientTest.java
index 8fc920b..2fef5b7 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFreezingClientTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFreezingClientTest.java
@@ -17,9 +17,9 @@
package org.apache.ignite.spi.communication.tcp;
+import javax.cache.Cache;
import java.lang.management.ManagementFactory;
import java.util.Iterator;
-import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.IgniteLogger;
@@ -103,7 +103,7 @@ public class TcpCommunicationSpiFreezingClientTest extends
GridCommonAbstractTes
@Test
public void testFreezingClient() throws Exception {
try {
- final IgniteEx srv = startGrid(0);
+ final IgniteEx srv = startGrids(2);
final IgniteEx client = startGrid("client");
diff --git
a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java
b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java
index 922051c..c829308 100644
---
a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java
@@ -107,6 +107,30 @@ public class GridCommandHandlerSslTest extends
GridCommandHandlerClusterPerMetho
}
/**
+ * Verifies that when client without SSL tries to connect to SSL-enabled
cluster,
+ * it fails and prints clear message with possible causes to output.
+ *
+ * @throws Exception If test failed.
+ */
+ @Test
+ public void testClientWithoutSslConnectsToSslEnabledCluster() throws
Exception {
+ startGrid(0);
+
+ List<String> params = new ArrayList<>();
+
+ params.add("--activate");
+
+ injectTestSystemOut();
+
+ assertEquals(EXIT_CODE_CONNECTION_FAILED, execute(params));
+
+ String out = testOut.toString();
+
+ assertContains(log, out, "firewall settings");
+ assertContains(log, out, "SSL configuration");
+ }
+
+ /**
* @throws Exception If test failed.
*/
@Test
