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/07/08 15:18:49 UTC
[35/50] incubator-ignite git commit: # review
# 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/cf6d99db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf6d99db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf6d99db
Branch: refs/heads/ignite-648-failover
Commit: cf6d99dbbe53cdd62cf32c42a2f9e57ec9f67b50
Parents: eabe14e
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Jul 8 06:13:00 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Jul 8 06:13:00 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/affinity/fair/FairAffinityFunction.java | 3 ++-
.../org/apache/ignite/testframework/junits/GridAbstractTest.java | 4 ++--
.../ignite/testframework/junits/multijvm/IgniteProcessProxy.java | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf6d99db/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java
index 15c5a3d..14a4f53 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java
@@ -31,7 +31,8 @@ import java.util.*;
* Fair affinity function which tries to ensure that all nodes get equal number of partitions with
* minimum amount of reassignments between existing nodes.
* <p>
- * Cache affinity can be configured for individual caches via {@link CacheConfiguration#setAffinity(AffinityFunction)} method.
+ * Cache affinity can be configured for individual caches via
+ * {@link CacheConfiguration#setAffinity(AffinityFunction)} method.
*/
@AffinityCentralizedFunction
public class FairAffinityFunction implements AffinityFunction {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf6d99db/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 3cdced7..4c391c2 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
@@ -1377,7 +1377,7 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @param gridName Grid name.
- * @return <code>True</code> if test was run in multy jvm mode and grid at another jvm.
+ * @return <code>True</code> if test was run in multi-JVM mode and grid at another jvm.
*/
protected boolean isMultiJvmAndNodeIsRemote(String gridName) {
return isMultiJvm() && !gridName.endsWith("0");
@@ -1512,7 +1512,7 @@ public abstract class GridAbstractTest extends TestCase {
}
/**
- * Runs job on remote jvm.
+ * Runs job on remote JVM.
*
* @param cache Cache.
* @param job Job.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf6d99db/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index 7ac652a..5da4503 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -101,7 +101,7 @@ public class IgniteProcessProxy implements IgniteEx {
System.getProperty("surefire.test.class.path")
);
- assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node with id=" + id + " didn't join.";
+ assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node has not joined [id=" + id + ']';
gridProxies.put(cfg.getGridName(), this);
}
@@ -117,7 +117,7 @@ public class IgniteProcessProxy implements IgniteEx {
/**
* @param id Id.
- * @param rmtNodeStartedLatch Remotenode started latch.
+ * @param rmtNodeStartedLatch Remote node started latch.
*/
NodeStartedListener(UUID id, CountDownLatch rmtNodeStartedLatch) {
this.id = id;