Merge branch 'master' into IGNITE-28221-Combining-of-the-message-factories

Author: Vladsz83

modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java

@@ -49,6 +49,12 @@ public final class ClientConfiguration implements Serializable {
     /** Serial version uid. */
     private static final long serialVersionUID = 0L;
 
+    /** Default connection/handshake timeout in milliseconds. */
+    private static final int DFLT_HANDSHAKE_TIMEOUT = 10_000;
+
+    /** Default operation request timeout in milliseconds. */
+    private static final int DFLT_REQUEST_TIMEOUT = 60_000;
+
     /** @serial Server addresses. */
     private String[] addrs;
 
@@ -58,11 +64,11 @@ public final class ClientConfiguration implements Serializable {
     /** @serial Tcp no delay. */
     private boolean tcpNoDelay = true;
 
-    /** @serial Handshake timeout in milliseconds. 0 means infinite. */
-    private int handshakeTimeout;
+    /** @serial Handshake timeout in milliseconds. A timeout of zero is interpreted as an infinite timeout. */
+    private int handshakeTimeout = DFLT_HANDSHAKE_TIMEOUT;
 
-    /** @serial Request timeout in milliseconds. 0 means infinite. */
-    private int reqTimeout;
+    /** @serial Request timeout in milliseconds. A timeout of zero is interpreted as an infinite timeout. */
+    private int reqTimeout = DFLT_REQUEST_TIMEOUT;
 
     /** @serial Send buffer size. 0 means system default. */
     private int sndBufSize = 32 * 1024;
@@ -261,14 +267,16 @@ public ClientConfiguration setTimeout(int timeout) {
     }
 
     /**
-     * @return Handshake timeout in milliseconds. 0 means infinite.
+     * @return Handshake timeout in milliseconds. A timeout of zero is interpreted as an infinite timeout.
+     *         By default, the timeout value is set to {@link #DFLT_HANDSHAKE_TIMEOUT}.
      */
     public int getHandshakeTimeout() {
         return handshakeTimeout;
     }
 
     /**
-     * @param handshakeTimeout Handshake timeout in milliseconds. 0 means infinite.
+     * @param handshakeTimeout Handshake timeout in milliseconds. A timeout of zero is interpreted as an infinite timeout.
+     *                         By default, the timeout value is set to {@link #DFLT_HANDSHAKE_TIMEOUT}.
      * @return {@code this} for chaining.
      */
     public ClientConfiguration setHandshakeTimeout(int handshakeTimeout) {
@@ -278,14 +286,16 @@ public ClientConfiguration setHandshakeTimeout(int handshakeTimeout) {
     }
 
     /**
-     * @return Request timeout in milliseconds. 0 means infinite.
+     * @return Request timeout in milliseconds. A timeout of zero is interpreted as an infinite timeout.
+     *         By default, the timeout value is set to {@link #DFLT_REQUEST_TIMEOUT}.
      */
     public int getRequestTimeout() {
         return reqTimeout;
     }
 
     /**
-     * @param reqTimeout Request timeout in milliseconds. 0 means infinite.
+     * @param reqTimeout Request timeout in milliseconds. A timeout of zero is interpreted as an infinite timeout.
+     *                   By default, the timeout value is set to {@link #DFLT_REQUEST_TIMEOUT}.
      * @return {@code this} for chaining.
      */
     public ClientConfiguration setRequestTimeout(int reqTimeout) {

modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java

@@ -58,8 +58,10 @@ public GridCollisionManager(GridKernalContext ctx) {
                 }
             });
         }
-        else
-            log.info("Collision resolution is disabled (all jobs will be activated upon arrival).");
+        else {
+            if (log.isInfoEnabled())
+                log.info("Collision resolution is disabled (all jobs will be activated upon arrival).");
+        }
 
         if (log.isDebugEnabled())
             log.debug(startInfo());

modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java

@@ -28,6 +28,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 /**
  * Tests for making sure that {@link GridCollisionManager} logs about specific conditions at correct levels,
@@ -56,9 +57,17 @@ public void initLoggerMock() {
     public void collisionResolutionDisabledMessageShouldBeLoggedAtInfoLevel() throws Exception {
         GridCollisionManager mgr = new GridCollisionManager(collisionResolutionDisabledContext());
 
-        mgr.start();
+        boolean infoLevel = logger.isInfoEnabled();
+        when(logger.isInfoEnabled()).thenReturn(true);
 
-        verify(logger).info("Collision resolution is disabled (all jobs will be activated upon arrival).");
+        try {
+            mgr.start();
+
+            verify(logger).info("Collision resolution is disabled (all jobs will be activated upon arrival).");
+        }
+        finally {
+            when(logger.isInfoEnabled()).thenReturn(infoLevel);
+        }
     }
 
     /**

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Unmanaged/JniThreadDetachTest.cs

@@ -50,7 +50,7 @@ private string[] GetJavaThreadNames()
         {
             return Ignite.GetCompute()
                 .ExecuteJavaTask<string[]>("org.apache.ignite.platform.PlatformThreadNamesTask", null)
-                .Where(x => !x.StartsWith("pub-#") && !x.StartsWith("jvm-"))
+                .Where(x => !x.StartsWith("pub-#") && !x.StartsWith("jvm-") && !x.StartsWith("mgmt-"))
                 .OrderBy(x => x)
                 .ToArray();
         }