You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/06 10:02:30 UTC
[1/4] incubator-ignite git commit: disable failing test
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1086 558df06d4 -> 95da66291
disable failing test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/334fee9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/334fee9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/334fee9e
Branch: refs/heads/ignite-1086
Commit: 334fee9e300342c0a9613fdcaba5aa97ef1a86a4
Parents: f72b291
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Jul 6 10:19:18 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Jul 6 10:19:18 2015 +0300
----------------------------------------------------------------------
.../IgniteCacheAtomicReplicatedNodeRestartSelfTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/334fee9e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
index 379ed65..52d8871 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
@@ -31,6 +31,11 @@ public class IgniteCacheAtomicReplicatedNodeRestartSelfTest extends GridCacheRep
}
/** {@inheritDoc} */
+ @Override public void testRestartWithPutSixNodesTwoBackups() throws Throwable {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1095");
+ }
+
+ /** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
[4/4] incubator-ignite git commit: Merge branch 'ignite-1086' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1086
Posted by iv...@apache.org.
Merge branch 'ignite-1086' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1086
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/95da6629
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/95da6629
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/95da6629
Branch: refs/heads/ignite-1086
Commit: 95da66291bc22af2e0155617c2c54994746e1e34
Parents: f8d1e90 558df06
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 6 10:59:58 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 6 10:59:58 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/4] incubator-ignite git commit: #ignite-1086: change test.
Posted by iv...@apache.org.
#ignite-1086: change test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8d1e90e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8d1e90e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8d1e90e
Branch: refs/heads/ignite-1086
Commit: f8d1e90e942ffc996b18a6c46f96ec090b27ba61
Parents: 84233f2
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 6 10:59:44 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 6 10:59:44 2015 +0300
----------------------------------------------------------------------
.../TcpDiscoveryNodeConsistentIdSelfTest.java | 24 +++++++++++++++-----
1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8d1e90e/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java
index 411e85d..d159d72 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNodeConsistentIdSelfTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.spi.discovery.tcp;
+import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.spi.discovery.tcp.internal.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -43,7 +44,7 @@ public class TcpDiscoveryNodeConsistentIdSelfTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- startGrids(2);
+ startGrids(1);
}
/** {@inheritDoc} */
@@ -56,13 +57,24 @@ public class TcpDiscoveryNodeConsistentIdSelfTest extends GridCommonAbstractTest
*/
public void testConsistentId() throws Exception {
Object id0 = grid(0).localNode().consistentId();
- Object id1 = grid(1).localNode().consistentId();
- stopAllGrids();
+ int port0 = getDiscoveryPort(grid(0));
+
+ for (int i = 0; i < 10; ++i) {
+ stopAllGrids();
+
+ startGrids(1);
- startGrids(2);
+ if (port0 == getDiscoveryPort(grid(0)))
+ assertEquals(id0, grid(0).localNode().consistentId());
+ }
+ }
- assertEquals(id0, grid(0).localNode().consistentId());
- assertEquals(id1, grid(1).localNode().consistentId());
+ /**
+ * @param ignite Ignite.
+ * @return Discovery port.
+ */
+ private int getDiscoveryPort(Ignite ignite) {
+ return ((TcpDiscoveryNode) ignite.cluster().localNode()).discoveryPort();
}
}
[2/4] incubator-ignite git commit: Merge branch 'ignite-sprint-7'
into ignite-1086
Posted by iv...@apache.org.
Merge branch 'ignite-sprint-7' into ignite-1086
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/84233f2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/84233f2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/84233f2c
Branch: refs/heads/ignite-1086
Commit: 84233f2cbe7c4a9adf02aad981573c89dbef7324
Parents: d8f5b6f 334fee9
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 6 10:46:51 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 6 10:46:51 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 8 +-
bin/ignite.sh | 6 +-
bin/include/parseargs.bat | 1 +
bin/include/parseargs.sh | 3 +
.../startup/cmdline/CommandLineStartup.java | 3 +-
.../startup/cmdline/CommandLineTransformer.java | 9 +
.../GridCachePartitionedFailoverSelfTest.java | 5 +
...acheAtomicReplicatedNodeRestartSelfTest.java | 5 +
modules/kafka/pom.xml | 116 ++++++
.../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++
.../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++
.../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++
.../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++
.../ignite/stream/kafka/SimplePartitioner.java | 53 +++
.../util/spring/IgniteSpringHelperImpl.java | 72 +++-
.../IgniteExcludeInConfigurationTest.java | 78 ++++
.../org/apache/ignite/spring/sprint-exclude.xml | 57 +++
.../testsuites/IgniteSpringTestSuite.java | 2 +
.../ignite/visor/commands/VisorConsole.scala | 3 +-
.../visor/commands/open/VisorOpenCommand.scala | 319 ++++++++++++++++
.../scala/org/apache/ignite/visor/visor.scala | 230 +----------
.../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +
.../commands/kill/VisorKillCommandSpec.scala | 1 +
.../commands/start/VisorStartCommandSpec.scala | 1 +
.../commands/tasks/VisorTasksCommandSpec.scala | 1 +
.../commands/vvm/VisorVvmCommandSpec.scala | 1 +
pom.xml | 1 +
27 files changed, 1598 insertions(+), 241 deletions(-)
----------------------------------------------------------------------