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/11/02 08:33:02 UTC
[1/3] ignite git commit: Minor: improved toString for
GridCacheTxRecoveryFuture.
Repository: ignite
Updated Branches:
refs/heads/ignite-1758 bb9c329ae -> 97334ac73
Minor: improved toString for GridCacheTxRecoveryFuture.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fff4e453
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fff4e453
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fff4e453
Branch: refs/heads/ignite-1758
Commit: fff4e4533ba187ddb4e24bec7effd691ff46c5d4
Parents: 11d177f
Author: sboikov <sb...@gridgain.com>
Authored: Mon Nov 2 10:09:29 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Nov 2 10:09:29 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/GridCacheTxRecoveryFuture.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fff4e453/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
index 4d75403..b266c4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
@@ -33,7 +33,9 @@ import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.GridLeanMap;
import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.C1;
import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -434,7 +436,16 @@ public class GridCacheTxRecoveryFuture extends GridCompoundIdentityFuture<Boolea
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(GridCacheTxRecoveryFuture.class, this, "super", super.toString());
+ Collection<String> futs = F.viewReadOnly(futures(), new C1<IgniteInternalFuture<?>, String>() {
+ @Override public String apply(IgniteInternalFuture<?> f) {
+ return "[node=" + ((MiniFuture)f).nodeId +
+ ", done=" + f.isDone() + "]";
+ }
+ });
+
+ return S.toString(GridCacheTxRecoveryFuture.class, this,
+ "innerFuts", futs,
+ "super", super.toString());
}
/**
[3/3] ignite git commit: ignite-1758 debug
Posted by sb...@apache.org.
ignite-1758 debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97334ac7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97334ac7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97334ac7
Branch: refs/heads/ignite-1758
Commit: 97334ac73f7961b8ec65bffcacd6ad809662d8db
Parents: 25bd6a9
Author: sboikov <sb...@gridgain.com>
Authored: Mon Nov 2 10:32:53 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Nov 2 10:32:53 2015 +0300
----------------------------------------------------------------------
.../tcp/TcpDiscoveryMultiThreadedTest.java | 2 --
.../ignite/testsuites/IgniteSpiTestSuite.java | 34 ++------------------
2 files changed, 2 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97334ac7/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 09b3ef8..5cb7f23 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -161,8 +161,6 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
* @throws Exception If any error occurs.
*/
public void testMultiThreadedClientsRestart() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-1123");
-
final AtomicBoolean done = new AtomicBoolean();
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/97334ac7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
index fc4023a..9c45dff 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
@@ -19,6 +19,7 @@ package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
import org.apache.ignite.internal.managers.GridNoopManagerSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMultiThreadedTest;
/**
* Grid SPI test suite.
@@ -31,38 +32,7 @@ public class IgniteSpiTestSuite extends TestSuite {
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Ignite SPIs Test Suite");
- // Failover.
- suite.addTest(IgniteSpiFailoverSelfTestSuite.suite());
-
- // Collision.
- suite.addTest(IgniteSpiCollisionSelfTestSuite.suite());
-
- // Event storage.
- suite.addTest(IgniteSpiEventStorageSelfTestSuite.suite());
-
- // Load Balancing.
- suite.addTest(IgniteSpiLoadBalancingSelfTestSuite.suite());
-
- // Swap space.
- suite.addTest(IgniteSpiSwapSpaceSelfTestSuite.suite());
-
- // Checkpoints.
- suite.addTest(IgniteSpiCheckpointSelfTestSuite.suite());
-
- // Deployment
- suite.addTest(IgniteSpiDeploymentSelfTestSuite.suite());
-
- // Discovery.
- suite.addTest(IgniteSpiDiscoverySelfTestSuite.suite());
-
- // Communication.
- suite.addTest(IgniteSpiCommunicationSelfTestSuite.suite());
-
- // Indexing.
- suite.addTest(IgniteSpiIndexingSelfTestSuite.suite());
-
- // All other tests.
- suite.addTestSuite(GridNoopManagerSelfTest.class);
+ suite.addTest(new TestSuite(TcpDiscoveryMultiThreadedTest.class));
return suite;
}
[2/3] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1758
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1758
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/25bd6a9d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/25bd6a9d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/25bd6a9d
Branch: refs/heads/ignite-1758
Commit: 25bd6a9d14feabd70c4479c7fcf5295c07d512cd
Parents: bb9c329 fff4e45
Author: sboikov <sb...@gridgain.com>
Authored: Mon Nov 2 10:29:00 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Nov 2 10:29:00 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/GridCacheTxRecoveryFuture.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------