You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/07/21 13:27:28 UTC
[1/4] incubator-ignite git commit: # IGNITE-1131 Handle non-file
codebase URI.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-752 49098e93e -> ec1c76606
# IGNITE-1131 Handle non-file codebase URI.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a6b8764e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6b8764e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6b8764e
Branch: refs/heads/ignite-752
Commit: a6b8764e8b8b7f8bb0779106cd89de131e64aeb6
Parents: f0d24f6
Author: sevdokimov <se...@jetbrains.com>
Authored: Fri Jul 17 14:32:11 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Fri Jul 17 14:32:11 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/IgniteUtils.java | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6b8764e/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 66eb596..2d5887c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3134,7 +3134,7 @@ public abstract class IgniteUtils {
return ggHome0;
}
- URI uri;
+ URI classesUri;
Class<IgniteUtils> cls = IgniteUtils.class;
@@ -3149,11 +3149,11 @@ public abstract class IgniteUtils {
}
// Resolve path to class-file.
- uri = domain.getCodeSource().getLocation().toURI();
+ classesUri = domain.getCodeSource().getLocation().toURI();
// Overcome UNC path problem on Windows (http://www.tomergabel.com/JavaMishandlesUNCPathsOnWindows.aspx)
- if (isWindows() && uri.getAuthority() != null)
- uri = new URI(uri.toString().replace("file://", "file:/"));
+ if (isWindows() && classesUri.getAuthority() != null)
+ classesUri = new URI(classesUri.toString().replace("file://", "file:/"));
}
catch (URISyntaxException | SecurityException e) {
logResolveFailed(cls, e);
@@ -3161,7 +3161,18 @@ public abstract class IgniteUtils {
return null;
}
- return findProjectHome(new File(uri));
+ File classesFile;
+
+ try {
+ classesFile = new File(classesUri);
+ }
+ catch (IllegalArgumentException e) {
+ logResolveFailed(cls, e);
+
+ return null;
+ }
+
+ return findProjectHome(classesFile);
}
/**
[4/4] incubator-ignite git commit: review
Posted by yz...@apache.org.
review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec1c7660
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec1c7660
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec1c7660
Branch: refs/heads/ignite-752
Commit: ec1c76606bcde4c6b761a13e8e428c0afb58c63a
Parents: 04dec8c
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 21 14:27:19 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 21 14:27:19 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/configuration/IgniteConfiguration.java | 10 +++++-----
.../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 2 +-
.../TcpClientDiscoverySpiFailureThresholdSelfTest.java | 6 +-----
.../tcp/TcpDiscoverySpiFailureThresholdSelfTest.java | 9 +++------
4 files changed, 10 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec1c7660/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 50f78a5..423410a 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -189,7 +189,7 @@ public class IgniteConfiguration {
/** Default value for cache sanity check enabled flag. */
public static final boolean DFLT_CACHE_SANITY_CHECK_ENABLED = true;
- /** Default failure detection threshold used by DiscoverySpi and CommunicationSpi in millis. */
+ /** Default failure detection threshold used by Discovery SPI and Communication SPI in millis. */
public static final long DFLT_FAILURE_DETECTION_THRESHOLD = 10_000;
/** Optional grid name. */
@@ -369,7 +369,7 @@ public class IgniteConfiguration {
/** Port number range for time server. */
private int timeSrvPortRange = DFLT_TIME_SERVER_PORT_RANGE;
- /** Failure detection threshold used by DiscoverySpi and CommunicationSpi. */
+ /** Failure detection threshold used by Discovery SPI and Communication SPI. */
private long failureDetectionThreshold = DFLT_FAILURE_DETECTION_THRESHOLD;
/** Property names to include into node attributes. */
@@ -1640,7 +1640,7 @@ public class IgniteConfiguration {
* network related operations.
* <p>
* Default is {@link #DFLT_FAILURE_DETECTION_THRESHOLD}.
- * </p>
+ *
* @return Failure detection threshold in milliseconds.
* @see #setFailureDetectionThreshold(long)
*/
@@ -1659,7 +1659,7 @@ public class IgniteConfiguration {
* then the rest of the threshold is set a socket read timeout when the sending node is waiting for response. If
* the threshold is reached during the time the message is being sent or response is being received then
* {@link TcpDiscoverySpi} will process this failure according to its implementation.
- * </p>
+ *
* <p>
* The failure detection threshold is an easy and straightforward way to setup {@link TcpDiscoverySpi} and
* {@link TcpCommunicationSpi} depending on network conditions of a cluster. On the other hand if advanced setting
@@ -1668,7 +1668,7 @@ public class IgniteConfiguration {
* a parameter you will disable the failure detection threshold. The full list of such timeouts and parameters,
* that disable this threshold, is available as a part of {@link TcpDiscoverySpi} and {@link TcpCommunicationSpi}
* documentations.
- * </p>
+ *
* @param failureDetectionThreshold Failure detection threshold in milliseconds.
*/
public void setFailureDetectionThreshold(long failureDetectionThreshold) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec1c7660/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index e4902df..f6daefa 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -1002,7 +1002,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
* <p>
* If not provided, default value is {@link #DFLT_CONN_TIMEOUT}.
* <p>
- * By setting this value explicitly you disable {@link IgniteConfiguration#getFailureDetectionThreshold()}.
+ * When this property is explicitly set {@link IgniteConfiguration#getFailureDetectionThreshold()} is ignored.
*
* @param connTimeout Connect timeout.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec1c7660/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureThresholdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureThresholdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureThresholdSelfTest.java
index bfaeb7c..8e80047 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureThresholdSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureThresholdSelfTest.java
@@ -19,10 +19,6 @@ package org.apache.ignite.spi.discovery.tcp;
import org.apache.ignite.internal.util.typedef.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
/**
* Client-based discovery SPI test with failure detection threshold enabled.
*/
@@ -62,6 +58,6 @@ public class TcpClientDiscoverySpiFailureThresholdSelfTest extends TcpClientDisc
assertTrue(((TcpDiscoverySpi)(G.ignite("client-0").configuration().getDiscoverySpi())).
failureDetectionThresholdEnabled());
assertEquals(failureDetectionThreshold(),
- ((TcpDiscoverySpi)(G.ignite("client-0").configuration().getDiscoverySpi())).failureDetectionThreshold());
+ ((TcpDiscoverySpi)(G.ignite("client-0").configuration().getDiscoverySpi())).failureDetectionThreshold());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec1c7660/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureThresholdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureThresholdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureThresholdSelfTest.java
index d6b4cdf..4fdf886 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureThresholdSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureThresholdSelfTest.java
@@ -28,7 +28,6 @@ import org.apache.ignite.spi.discovery.tcp.internal.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.jetbrains.annotations.*;
import java.io.*;
import java.net.*;
@@ -265,7 +264,7 @@ public class TcpDiscoverySpiFailureThresholdSelfTest extends AbstractDiscoverySe
/**
* Returns the first spi with failure detection threshold enabled.
- *
+ *
* @return SPI.
*/
private TestTcpDiscoverySpi firstSpi() {
@@ -281,7 +280,7 @@ public class TcpDiscoverySpiFailureThresholdSelfTest extends AbstractDiscoverySe
private TestTcpDiscoverySpi secondSpi() {
return (TestTcpDiscoverySpi)spis.get(1);
}
-
+
/**
*
*/
@@ -333,8 +332,7 @@ public class TcpDiscoverySpiFailureThresholdSelfTest extends AbstractDiscoverySe
timeoutCtrl.nextTimeoutChunk(0);
}
catch (IgniteSpiOperationTimeoutException e) {
- err = new IgniteSpiOperationTimeoutException("Timeout: openSocketTimeoutWait");
- throw err;
+ throw (err = new IgniteSpiOperationTimeoutException("Timeout: openSocketTimeoutWait"));
}
}
@@ -407,5 +405,4 @@ public class TcpDiscoverySpiFailureThresholdSelfTest extends AbstractDiscoverySe
countConnCheckMsg = false;
}
}
-
}
[2/4] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1131'
Posted by yz...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1131'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/83bba05c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83bba05c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83bba05c
Branch: refs/heads/ignite-752
Commit: 83bba05ca976377210f09b2a6eb6b590355ae028
Parents: 9aa928c a6b8764
Author: sevdokimov <se...@jetbrains.com>
Authored: Tue Jul 21 12:59:45 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Tue Jul 21 12:59:45 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/IgniteUtils.java | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83bba05c/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
[3/4] incubator-ignite git commit: Merge branches 'ignite-752' and
'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-752_
Posted by yz...@apache.org.
Merge branches 'ignite-752' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-752_
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04dec8c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04dec8c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04dec8c6
Branch: refs/heads/ignite-752
Commit: 04dec8c698637ff56a2f600b156709e0a4d2b75d
Parents: 49098e9 83bba05
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 21 13:31:04 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 21 13:31:04 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/IgniteUtils.java | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------