[09/27] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-7' into ignite-sprint-7
Merge remote-tracking branch 'origin/ignite-sprint-7' into ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/188cd823 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/188cd823 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/188cd823 Branch: refs/heads/ignite-950 Commit: 188cd82327a41833c7884ef8b437652999a0e113 Parents: 27fbf02 6974a8e Author: ashutak Authored: Fri Jun 19 12:54:39 2015 +0300 Committer: ashutak Committed: Fri Jun 19 12:54:39 2015 +0300 -- .../processors/cache/GridCacheUtils.java| 9 + .../processors/cache/IgniteCacheProxy.java | 5 +++ .../processors/query/GridQueryProcessor.java| 7 .../processors/task/GridTaskProcessor.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 42 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java| 35 .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 ++-- .../tcp/internal/TcpDiscoveryNode.java | 18 + .../apache/ignite/internal/GridSelfTest.java| 20 ++ .../DataStreamerMultiThreadedSelfTest.java | 3 ++ 10 files changed, 134 insertions(+), 50 deletions(-) --
[06/27] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-7
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9458f125 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9458f125 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9458f125 Branch: refs/heads/ignite-950 Commit: 9458f12554579fd71a26f56d7bf191d0ec51173e Parents: edc9a1c ad0a026 Author: AKuznetsov Authored: Fri Jun 19 09:55:02 2015 +0700 Committer: AKuznetsov Committed: Fri Jun 19 09:55:02 2015 +0700 -- .../processors/cache/GridCacheUtils.java| 9 + .../processors/cache/IgniteCacheProxy.java | 5 +++ .../processors/query/GridQueryProcessor.java| 7 .../communication/tcp/TcpCommunicationSpi.java | 42 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java| 35 .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 ++-- .../tcp/internal/TcpDiscoveryNode.java | 18 + .../apache/ignite/internal/GridSelfTest.java| 20 ++ .../DataStreamerMultiThreadedSelfTest.java | 3 ++ 9 files changed, 132 insertions(+), 49 deletions(-) --
[05/27] incubator-ignite git commit: # ignite-sprint-7 disabled shmem for test
# ignite-sprint-7 disabled shmem for 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/edc9a1c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edc9a1c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edc9a1c4
Branch: refs/heads/ignite-950
Commit: edc9a1c4b13afb8ef36a961f4d5b252135b916b6
Parents: 044f17d
Author: sboikov
Authored: Thu Jun 18 16:31:57 2015 +0300
Committer: sboikov
Committed: Thu Jun 18 16:31:57 2015 +0300
--
.../processors/cache/distributed/IgniteCacheManyClientsTest.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edc9a1c4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
index c3223a2..48884de 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
@@ -63,6 +63,7 @@ public class IgniteCacheManyClientsTest extends
GridCommonAbstractTest {
cfg.setTimeServerPortRange(200);
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setLocalPortRange(200);
+
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setJoinTimeout(2 * 60_000);
[02/27] incubator-ignite git commit: 1.1.4-SNAPSHOT
1.1.4-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/489ab0f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/489ab0f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/489ab0f1 Branch: refs/heads/ignite-950 Commit: 489ab0f1a6b24460bf1896798780b2203a1f5d27 Parents: 8c2553e Author: Ignite Teamcity Authored: Wed Jun 17 16:54:34 2015 +0300 Committer: Ignite Teamcity Committed: Wed Jun 17 16:54:34 2015 +0300 -- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml| 2 +- modules/hadoop/pom.xml| 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml| 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml| 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml| 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml| 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/489ab0f1/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 016b3ce..834b5b4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.1.2-SNAPSHOT +1.1.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/489ab0f1/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index e04f183..e9cc980 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.1.2-SNAPSHOT +1.1.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/489ab0f1/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index f7fdfbc..1d3b1f3 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.1.2-SNAPSHOT +1.1.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/489ab0f1/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 7842c47..6b28630 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -31,7 +31,7 @@ ignite-clients -1.1.2-SNAPSHOT +1.1.4-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/489ab0f1/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 579c6a0..0c9cd3d 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -29,7 +29,7 @@ ignite-cloud -1.1.2-SNAPSHOT +1.1.4-SNAPSHOT 1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/489ab0f1/modules
[07/27] incubator-ignite git commit: # ignite-sprint-7
# ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6974a8e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6974a8e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6974a8e3
Branch: refs/heads/ignite-950
Commit: 6974a8e3d356a1e1b777064ae79cb0f67a50a077
Parents: 9458f12
Author: sboikov
Authored: Fri Jun 19 12:16:49 2015 +0300
Committer: sboikov
Committed: Fri Jun 19 12:16:49 2015 +0300
--
.../apache/ignite/internal/processors/task/GridTaskProcessor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6974a8e3/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index bb9ff50..d59a51d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -1175,7 +1175,8 @@ public class GridTaskProcessor extends
GridProcessorAdapter {
ctx.closure().runLocalSafe(new Runnable() {
@Override public void run() {
-lock.readLock();
+if (!lock.tryReadLock())
+return;
try {
for (GridTaskWorker task : tasks.values())
[12/27] incubator-ignite git commit: Merge branch 'ignite-sprint-6' into ignite-sprint-7
Merge branch 'ignite-sprint-6' into ignite-sprint-7 Conflicts: examples/pom.xml modules/aop/pom.xml modules/aws/pom.xml modules/clients/pom.xml modules/cloud/pom.xml modules/codegen/pom.xml modules/core/pom.xml modules/core/src/main/resources/ignite.properties modules/extdata/p2p/pom.xml modules/extdata/uri/pom.xml modules/gce/pom.xml modules/geospatial/pom.xml modules/hadoop/pom.xml modules/hibernate/pom.xml modules/indexing/pom.xml modules/jcl/pom.xml modules/jta/pom.xml modules/log4j/pom.xml modules/mesos/pom.xml modules/rest-http/pom.xml modules/scalar-2.10/pom.xml modules/scalar/pom.xml modules/schedule/pom.xml modules/schema-import/pom.xml modules/slf4j/pom.xml modules/spark-2.10/pom.xml modules/spark/pom.xml modules/spring/pom.xml modules/ssh/pom.xml modules/tools/pom.xml modules/urideploy/pom.xml modules/visor-console-2.10/pom.xml modules/visor-console/pom.xml modules/visor-plugins/pom.xml modules/web/pom.xml modules/yardstick/pom.xml pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec9cfcaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec9cfcaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec9cfcaf Branch: refs/heads/ignite-950 Commit: ec9cfcaf8b245be6fe4723b1e2d08526d3a6d4cb Parents: 8fa9d3d d699faa Author: vozerov-gridgain Authored: Fri Jun 19 15:32:21 2015 +0300 Committer: vozerov-gridgain Committed: Fri Jun 19 15:32:21 2015 +0300 -- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++-- 1 file changed, 41 insertions(+), 3 deletions(-) --
[18/27] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1048
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1048 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a2d2c9b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a2d2c9b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a2d2c9b9 Branch: refs/heads/ignite-950 Commit: a2d2c9b96e9bd86f2f711df5da835c95af57b612 Parents: be881a3 c7ba154 Author: sboikov Authored: Tue Jun 23 12:56:44 2015 +0300 Committer: sboikov Committed: Tue Jun 23 12:56:44 2015 +0300 -- .../replicated/GridCacheReplicatedFailoverSelfTest.java | 5 + 1 file changed, 5 insertions(+) --
[01/27] incubator-ignite git commit: Added tests on EVT_CACHE_REBALANCE_PART_DATA_LOST event.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-950 d8fbf7107 -> ca8d66e92
Added tests on EVT_CACHE_REBALANCE_PART_DATA_LOST event.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c2553ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c2553ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c2553ed
Branch: refs/heads/ignite-950
Commit: 8c2553eda7ea68498c1d0235060b20f31ef55c8a
Parents: 01eee2d
Author: nikolay_tikhonov
Authored: Wed Jun 17 16:12:48 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed Jun 17 16:12:48 2015 +0300
--
...ridCachePartitionNotLoadedEventSelfTest.java | 82
.../ignite/util/TestTcpCommunicationSpi.java| 21 +
2 files changed, 103 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c2553ed/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
index 6da27d5..baa6d89 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
@@ -22,15 +22,19 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.junits.common.*;
import org.apache.ignite.util.*;
import org.eclipse.jetty.util.*;
import java.util.*;
+import java.util.concurrent.*;
/**
*
@@ -150,6 +154,84 @@ public class GridCachePartitionNotLoadedEventSelfTest
extends GridCommonAbstract
}
/**
+ * @throws Exception If failed.
+ */
+public void testStableTopology() throws Exception {
+backupCnt = 1;
+
+startGrid(1);
+
+awaitPartitionMapExchange();
+
+startGrid(0);
+
+PartitionNotFullyLoadedListener lsnr = new
PartitionNotFullyLoadedListener();
+
+grid(1).events().localListen(lsnr,
EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST);
+
+IgniteCache cache0 = jcache(0);
+
+int key = primaryKey(cache0);
+
+jcache(1).put(key, key);
+
+assert cache0.containsKey(key);
+
+TestTcpCommunicationSpi.stop(ignite(0));
+
+stopGrid(0, true);
+
+awaitPartitionMapExchange();
+
+assert jcache(1).containsKey(key);
+
+assert lsnr.lostParts.isEmpty();
+}
+
+
+/**
+ * @throws Exception If failed.
+ */
+public void testMapPartitioned() throws Exception {
+backupCnt = 0;
+
+startGrid(0);
+
+startGrid(1);
+
+PartitionNotFullyLoadedListener lsnr = new
PartitionNotFullyLoadedListener();
+
+grid(1).events().localListen(lsnr,
EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST);
+
+TestTcpCommunicationSpi.skipMsgType(ignite(0),
GridDhtPartitionsFullMessage.class);
+
+IgniteInternalFuture fut = GridTestUtils.runAsync(new
Callable() {
+@Override public Object call() throws Exception {
+startGrid(2);
+
+return null;
+}
+});
+
+boolean timeout = false;
+
+try {
+fut.get(1, TimeUnit.SECONDS);
+}
+catch (IgniteFutureTimeoutCheckedException e) {
+timeout = true;
+}
+
+assert timeout;
+
+stopGrid(0, true);
+
+awaitPartitionMapExchange();
+
+assert !lsnr.lostParts.isEmpty();
+}
+
+/**
*
*/
private static class PartitionNotFullyLoadedListener implements
IgnitePredicate {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c2553ed/modules/core/src/test/java/org/apache/ignite/util/TestTcpCommunicationSpi.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/util/TestTcpCommunicationSpi.java
b/modules/core/src/test/j
[19/27] incubator-ignite git commit: # ignite-sprint-7 minor
# ignite-sprint-7 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36433bc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36433bc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36433bc3
Branch: refs/heads/ignite-950
Commit: 36433bc3d96a67975ce99a0774e608ccf50c2a21
Parents: c7ba154
Author: sboikov
Authored: Tue Jun 23 13:31:34 2015 +0300
Committer: sboikov
Committed: Tue Jun 23 13:31:34 2015 +0300
--
.../org/apache/ignite/testframework/junits/GridAbstractTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36433bc3/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 9c42920..9a63b3a 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
@@ -606,7 +606,7 @@ public abstract class GridAbstractTest extends TestCase {
Thread.sleep(1000);
}
-throw new Exception("Failed to wait for proper topology.");
+throw new Exception("Failed to wait for proper topology: " + cnt);
}
/** */
[10/27] incubator-ignite git commit: 1.1.6-SNAPSHOT
1.1.6-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0063897 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0063897 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0063897 Branch: refs/heads/ignite-950 Commit: d0063897052b97398a93bd3ac32fd573d0d7f3d3 Parents: 188cd82 Author: Ignite Teamcity Authored: Fri Jun 19 12:56:32 2015 +0300 Committer: Ignite Teamcity Committed: Fri Jun 19 12:56:32 2015 +0300 -- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml| 2 +- modules/hadoop/pom.xml| 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml| 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml| 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml| 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml| 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0063897/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 834b5b4..bcff11e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.1.4-SNAPSHOT +1.1.6-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0063897/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index e9cc980..5eea18d 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.1.4-SNAPSHOT +1.1.6-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0063897/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 1d3b1f3..05ecbc1 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.1.4-SNAPSHOT +1.1.6-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0063897/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 6b28630..7c4d2c8 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -31,7 +31,7 @@ ignite-clients -1.1.4-SNAPSHOT +1.1.6-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0063897/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 0c9cd3d..bb32689 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -29,7 +29,7 @@ ignite-cloud -1.1.4-SNAPSHOT +1.1.6-SNAPSHOT 1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0063897/modules
[24/27] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-950
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-950 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a46a713 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a46a713 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a46a713 Branch: refs/heads/ignite-950 Commit: 9a46a713638cb16568d4f489f80b02ecaec44b17 Parents: d8fbf71 359b431 Author: Denis Magda Authored: Wed Jun 24 08:38:15 2015 +0300 Committer: Denis Magda Committed: Wed Jun 24 08:38:15 2015 +0300 -- examples/pom.xml| 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../configuration/IgniteReflectionFactory.java | 81 ++- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 9 +- .../processors/hadoop/HadoopJobInfo.java| 4 +- .../hadoop/counter/HadoopCounterWriter.java | 5 +- .../processors/task/GridTaskProcessor.java | 23 +- .../core/src/main/resources/ignite.properties | 2 +- .../GridTaskFailoverAffinityRunTest.java| 170 + ...ridCachePartitionNotLoadedEventSelfTest.java | 82 +++ .../distributed/IgniteCacheManyClientsTest.java | 1 + .../IgniteCacheTxMessageRecoveryTest.java | 5 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java| 5 + .../testframework/junits/GridAbstractTest.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 4 +- .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../ignite/util/TestTcpCommunicationSpi.java| 21 ++ modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 80 +- .../fs/IgniteHadoopFileSystemCounterWriter.java | 9 +- .../processors/hadoop/HadoopClassLoader.java| 29 +++ .../processors/hadoop/HadoopDefaultJobInfo.java | 27 +-- .../internal/processors/hadoop/HadoopUtils.java | 237 -- .../hadoop/SecondaryFileSystemProvider.java | 3 +- .../hadoop/fs/HadoopFileSystemCacheUtils.java | 241 +++ .../hadoop/fs/HadoopFileSystemsUtils.java | 11 + .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 + .../hadoop/jobtracker/HadoopJobTracker.java | 25 +- .../child/HadoopChildProcessRunner.java | 3 +- .../processors/hadoop/v2/HadoopV2Job.java | 84 ++- .../hadoop/v2/HadoopV2JobResourceManager.java | 22 +- .../hadoop/v2/HadoopV2TaskContext.java | 37 ++- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 5 +- .../processors/hadoop/HadoopMapReduceTest.java | 2 +- .../processors/hadoop/HadoopTasksV1Test.java| 7 +- .../processors/hadoop/HadoopTasksV2Test.java| 7 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 3 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 + .../IgniteCacheQuerySelfTestSuite.java | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xm
[26/27] incubator-ignite git commit: ignite-950: fixed hangning detected by Service related tests
ignite-950: fixed hangning detected by Service related tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9eef6b73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9eef6b73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9eef6b73
Branch: refs/heads/ignite-950
Commit: 9eef6b7385c8fc40cea20e84e12228efb4fd1677
Parents: 8d8900f
Author: Denis Magda
Authored: Wed Jun 24 09:11:57 2015 +0300
Committer: Denis Magda
Committed: Wed Jun 24 09:11:57 2015 +0300
--
.../processors/service/GridServiceProcessorMultiNodeSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9eef6b73/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
index 447d103..77b2ea5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.*;
public class GridServiceProcessorMultiNodeSelfTest extends
GridServiceProcessorAbstractSelfTest {
/** {@inheritDoc} */
@Override protected int nodeCount() {
-return 2;
+return 4;
}
/**
[14/27] incubator-ignite git commit: # ignite-sprint-7: fix compilation after merge.
# ignite-sprint-7: fix compilation after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5d8e404f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d8e404f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d8e404f
Branch: refs/heads/ignite-950
Commit: 5d8e404f8d871f96a11238d865c6a7c656080638
Parents: cd06e1d
Author: ashutak
Authored: Mon Jun 22 16:28:29 2015 +0300
Committer: ashutak
Committed: Mon Jun 22 16:28:29 2015 +0300
--
.../apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d8e404f/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 14093ba..181ff0c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -62,7 +62,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest.class);
suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
-
suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
TODO IGNITE-971.
+
suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheOffheapEvictQueryTest.class);
suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class);
[08/27] incubator-ignite git commit: # ignite-695: Fix (the rest of todos)
# ignite-695: Fix (the rest of todos)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27fbf022
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27fbf022
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27fbf022
Branch: refs/heads/ignite-950
Commit: 27fbf022fce03b1577f1ea7afe2bd3ea8fa11c0f
Parents: edc9a1c
Author: ashutak
Authored: Fri Jun 19 12:54:09 2015 +0300
Committer: ashutak
Committed: Fri Jun 19 12:54:09 2015 +0300
--
.../cache/distributed/IgniteCacheTxMessageRecoveryTest.java | 5 +
.../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java | 4 ++--
.../IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java | 5 +
.../apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java | 2 +-
.../internal/websession/IgniteWebSessionSelfTestSuite.java | 2 +-
6 files changed, 15 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27fbf022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
index f26948a..fab1bf3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxMessageRecoveryTest.java
@@ -26,6 +26,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
*/
public class IgniteCacheTxMessageRecoveryTest extends
IgniteCacheMessageRecoveryAbstractTest {
/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-795";);
+}
+
+/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return TRANSACTIONAL;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27fbf022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index e78b782..8343c64 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -194,7 +194,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest
extends GridCachePartitio
/** {@inheritDoc} */
@Override public void testNearDhtKeySize() throws Exception {
-// TODO fix this test for client mode.
+fail("https://issues.apache.org/jira/browse/IGNITE-1029";);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27fbf022/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 6245308..0a31f49 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -113,7 +113,7 @@ public class IgniteCacheTestSuite extends TestSuite {
GridTestUtils.addTestIfNeeded(suite, GridCacheMvccSelfTest.class,
ignoredTests);
suite.addTestSuite(GridCacheMvccPartitionedSelfTest.class);
suite.addTestSuite(GridCacheMvccManagerSelfTest.class);
-//suite.addTestSuite(GridCacheP2PUndeploySelfTest.class); TODO
uncomment in DR branch.
+suite.addTestSuite(GridCacheP2PUndeploySelfTest.class);
suite.addTestSuite(GridCacheConfigurationValidationSelfTest.class);
suite.addTestSuite(GridCacheConfigurationConsistencySelfTest.class);
suite.addTestSuite(GridCacheJdbcBlobStoreSelfTest.class);
@@ -151,7 +151,7
[22/27] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1048' into ignite-sprint-7
Merge remote-tracking branch 'remotes/origin/ignite-1048' into ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfe95bdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfe95bdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfe95bdf Branch: refs/heads/ignite-950 Commit: dfe95bdfb98663134809ca456f63e100fb1e7c26 Parents: 2bb6e0f a2d2c9b Author: sboikov Authored: Tue Jun 23 16:38:38 2015 +0300 Committer: sboikov Committed: Tue Jun 23 16:38:38 2015 +0300 -- .../cache/distributed/dht/GridDhtLocalPartition.java| 3 ++- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java| 9 - 2 files changed, 6 insertions(+), 6 deletions(-) --
[16/27] incubator-ignite git commit: ignite-1048 create/lock entries before topology read lock
ignite-1048 create/lock entries before topology read lock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be881a36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be881a36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be881a36
Branch: refs/heads/ignite-950
Commit: be881a367ef02a724c2b84aba8f72c6effadc2b2
Parents: 1c66078
Author: sboikov
Authored: Tue Jun 23 10:52:47 2015 +0300
Committer: sboikov
Committed: Tue Jun 23 10:52:47 2015 +0300
--
.../cache/distributed/dht/GridDhtLocalPartition.java| 3 ++-
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java| 9 -
2 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be881a36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 3a577a7..87c7f0e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -236,7 +236,8 @@ public class GridDhtLocalPartition implements
Comparable,
void onAdded(GridDhtCacheEntry entry) {
GridDhtPartitionState state = state();
-assert state != EVICTED : "Adding entry to invalid partition: " + this;
+if (state == EVICTED)
+throw new GridDhtInvalidPartitionException(id, "Adding entry to
invalid partition [part=" + id + ']');
map.put(entry.key(), entry);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be881a36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 8630421..7bec302 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1028,7 +1028,10 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
IgniteCacheExpiryPolicy expiry = null;
try {
-List locked = null;
+// If batch store update is enabled, we need to lock all entries.
+// First, need to acquire locks on cache entries, then check
filter.
+List locked = lockEntries(keys,
req.topologyVersion());
+
Collection>
deleted = null;
try {
@@ -1058,10 +1061,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
return;
}
-// If batch store update is enabled, we need to lock
all entries.
-// First, need to acquire locks on cache entries, then
check filter.
-locked = lockEntries(keys, req.topologyVersion());
-
boolean hasNear = ctx.discovery().cacheNearNode(node,
name());
GridCacheVersion ver = req.updateVersion();
[03/27] incubator-ignite git commit: Merge branch 'ignite-sprint-6' into ignite-sprint-7
Merge branch 'ignite-sprint-6' into ignite-sprint-7 Conflicts: examples/pom.xml modules/aop/pom.xml modules/aws/pom.xml modules/clients/pom.xml modules/cloud/pom.xml modules/codegen/pom.xml modules/core/pom.xml modules/core/src/main/resources/ignite.properties modules/extdata/p2p/pom.xml modules/extdata/uri/pom.xml modules/gce/pom.xml modules/geospatial/pom.xml modules/hadoop/pom.xml modules/hibernate/pom.xml modules/indexing/pom.xml modules/jcl/pom.xml modules/jta/pom.xml modules/log4j/pom.xml modules/mesos/pom.xml modules/rest-http/pom.xml modules/scalar-2.10/pom.xml modules/scalar/pom.xml modules/schedule/pom.xml modules/schema-import/pom.xml modules/slf4j/pom.xml modules/spark-2.10/pom.xml modules/spark/pom.xml modules/spring/pom.xml modules/ssh/pom.xml modules/tools/pom.xml modules/urideploy/pom.xml modules/visor-console-2.10/pom.xml modules/visor-console/pom.xml modules/visor-plugins/pom.xml modules/web/pom.xml modules/yardstick/pom.xml pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6a0f24a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6a0f24a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6a0f24a Branch: refs/heads/ignite-950 Commit: c6a0f24adf62c58eb0b739183bbd8d572827ad14 Parents: 489ab0f d874b00 Author: vozerov-gridgain Authored: Thu Jun 18 11:21:44 2015 +0300 Committer: vozerov-gridgain Committed: Thu Jun 18 11:21:44 2015 +0300 -- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 +- .../s3/S3CheckpointSpiStartStopSelfTest.java| 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +- .../client/GridClientConfiguration.java | 4 +- .../affinity/AffinityTopologyVersion.java | 7 - .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/IgniteCacheProxy.java | 7 + .../distributed/dht/GridDhtLocalPartition.java | 56 +- .../dht/GridDhtPartitionTopologyImpl.java | 4 +- .../dht/GridDhtPartitionsReservation.java | 292 + .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../cache/distributed/dht/GridReservable.java | 35 + .../dht/preloader/GridDhtPartitionMap.java | 26 +- .../cache/query/GridCacheQueryManager.java | 33 - .../cache/query/GridCacheTwoStepQuery.java | 22 +- .../cache/transactions/IgniteTxHandler.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../dr/IgniteDrDataStreamerCacheUpdater.java| 7 +- .../processors/query/GridQueryIndexing.java | 14 +- .../processors/query/GridQueryProcessor.java| 14 +- .../messages/GridQueryNextPageResponse.java | 34 +- .../h2/twostep/messages/GridQueryRequest.java | 111 +++- .../apache/ignite/internal/util/GridDebug.java | 19 + .../CacheStoreUsageMultinodeAbstractTest.java | 305 + ...eUsageMultinodeDynamicStartAbstractTest.java | 169 + ...oreUsageMultinodeDynamicStartAtomicTest.java | 32 + ...heStoreUsageMultinodeDynamicStartTxTest.java | 32 + ...reUsageMultinodeStaticStartAbstractTest.java | 158 + ...toreUsageMultinodeStaticStartAtomicTest.java | 32 + ...cheStoreUsageMultinodeStaticStartTxTest.java | 32 + .../cache/GridCacheAbstractFullApiSelfTest.java | 24 +- .../IgniteCacheAbstractStopBusySelfTest.java| 30 +- .../IgniteCacheAtomicStopBusySelfTest.java | 8 +- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 19 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- .../junits/GridTestKernalContext.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 8 +- .../testsuites/IgniteCacheTestSuite4.java | 4 + .../processors/query/h2/IgniteH2Indexing.java | 79 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 49 +- .../query/h2/twostep/GridMapQueryExecutor.java | 332 +++--- .../query/h2/twostep/GridMergeIndex.java| 17 +- .../h2/twostep/GridMergeIndexUnsorted.java | 7 +- .../h2/twostep/GridReduceQueryExecutor.java | 650 --- .../query/h2/twostep/GridResultPage.java| 21 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 3 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 - ...lientQueryReplicatedNodeRestartSelfTest.java | 419 .../IgniteCacheQueryNodeRestartSelfTest.java| 36 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 383 +++ .../IgniteCacheQuerySelfTestSuite.java
[13/27] incubator-ignite git commit: Merge branch 'ignite-sprint-6' into ignite-sprint-7
Merge branch 'ignite-sprint-6' into ignite-sprint-7 Conflicts: modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd06e1d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd06e1d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd06e1d3 Branch: refs/heads/ignite-950 Commit: cd06e1d317e3f828cb0f64ef2e2903be8d1fea8b Parents: ec9cfca 1605996 Author: ashutak Authored: Mon Jun 22 16:02:08 2015 +0300 Committer: ashutak Committed: Mon Jun 22 16:02:08 2015 +0300 -- .../apache/ignite/IgniteSystemProperties.java | 3 + .../ignite/internal/MarshallerContextImpl.java | 12 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 30 ++- .../GridCachePartitionExchangeManager.java | 1 + .../processors/cache/GridCacheSwapManager.java | 12 +- .../continuous/CacheContinuousQueryHandler.java | 8 + .../offheap/GridOffHeapProcessor.java | 19 +- .../apache/ignite/internal/util/GridDebug.java | 37 ++-- .../ignite/internal/util/nio/GridNioServer.java | 64 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 9 +- .../communication/tcp/TcpCommunicationSpi.java | 92 - .../tcp/TcpCommunicationSpiMBean.java | 19 ++ .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 80 +--- .../ignite/spi/discovery/tcp/ServerImpl.java| 17 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 6 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 18 ++ ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../IgniteSlowClientDetectionSelfTest.java | 187 ++ .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++ .../testframework/GridSpiTestContext.java | 7 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 + .../processors/query/h2/IgniteH2Indexing.java | 2 + .../query/h2/twostep/GridMapQueryExecutor.java | 23 ++- .../cache/IgniteCacheOffheapEvictQueryTest.java | 196 +++ .../IgniteCacheQuerySelfTestSuite.java | 3 +- .../cache/jta/GridCacheXAResource.java | 18 +- .../processors/cache/GridCacheJtaSelfTest.java | 2 +- 32 files changed, 916 insertions(+), 108 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd06e1d3/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java -- diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index ae4acc2,b9205a9..14093ba --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@@ -62,7 -62,8 +62,8 @@@ public class IgniteCacheQuerySelfTestSu suite.addTestSuite(IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest.class); suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); -// suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); TODO IGNITE-971. ++ suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); TODO IGNITE-971. + suite.addTestSuite(IgniteCacheOffheapEvictQueryTest.class); suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class); suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class);
[15/27] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-7
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1c660781 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c660781 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c660781 Branch: refs/heads/ignite-950 Commit: 1c660781355f870271760dd6dc0392741fdb15f6 Parents: 5d8e404 285d790 Author: AKuznetsov Authored: Tue Jun 23 10:00:32 2015 +0700 Committer: AKuznetsov Committed: Tue Jun 23 10:00:32 2015 +0700 -- .../GridDhtPartitionsExchangeFuture.java| 49 +++- .../communication/tcp/TcpCommunicationSpi.java | 12 + .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - 3 files changed, 49 insertions(+), 13 deletions(-) --
[23/27] incubator-ignite git commit: # ignite-sprint-7: IgniteReflectionFactory javadoc
# ignite-sprint-7: IgniteReflectionFactory javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/359b4314
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/359b4314
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/359b4314
Branch: refs/heads/ignite-950
Commit: 359b43144046bc683f9e28794eb7e7bc9c63ebc1
Parents: dfe95bd
Author: ashutak
Authored: Tue Jun 23 16:59:44 2015 +0300
Committer: ashutak
Committed: Tue Jun 23 16:59:44 2015 +0300
--
.../configuration/IgniteReflectionFactory.java | 81 ++--
1 file changed, 76 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/359b4314/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
index 3222938..af73737 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java
@@ -26,26 +26,91 @@ import java.lang.reflect.*;
import java.util.*;
/**
- * Convenience class for reflection-based object creation.
+ * Factory implementation that use reflection to create instance of given
class.
+ *
+ * There are 2 modes of factory: singleton and non-sigletton.
+ *
+ * Class that should be created by {@link IgniteReflectionFactory} (component
class) have to be
+ * public java POJO with public setters for field
+ * for which property injection will be used (see {@link #setProperties(Map)}).
+ *
+ * Configuration
+ * Mandatory
+ * The following configuration parameters are mandatory:
+ *
+ * Component class - class to be created (see {@link
#setComponentClass(Class)}.
+ * It have to be public java POJO class with default constructor
+ * and public setters to be used by properties injection (see {@link
#setProperties(Map)})
+ *
+ * Optional
+ * The following configuration parameters are optional:
+ *
+ *
+ * Singleton mode (see {@link #setSingleton(boolean)})
+ * Properties map (see {@link #setProperties(Map)}
+ * With method (see {@link #setWithMethod(Object, String,
Serializable)}
+ *
+ * Java Example
+ *
+ * Factory factory =
+ * new
IgniteReflectionFactory(MyCacheStoreSessionListener.class);
+ *
+ * CacheConfiguration cc = new CacheConfiguration()
+ * .setCacheStoreSessionListenerFactories(factory);
+ *
+ * IgniteConfiguration cfg = new IgniteConfiguration()
+ * .setCacheConfiguration(cc);
+ *
+ * // Start grid.
+ * Ignition.start(cfg);
+ *
+ * Spring Example
+ * TcpDiscoverySpi can be configured from Spring XML configuration file:
+ *
+ *
+ * ...
+ *
+ *
+ *
+ * ...
+ *
+ *
+ *
+ *
+ *
+ *
+ * ...
+ *
+ *
+ *
+ * ...
+ *
+ *
+ *
+ * http://ignite.incubator.apache.org/images/spring-small.png";>
+ *
+ * For information about Spring framework visit http://www.springframework.org/";>www.springframework.org
+ * @see Factory
*/
public class IgniteReflectionFactory implements Factory {
/** */
private static final long serialVersionUID = 0L;
-/** */
+/** Singletom mode */
private volatile boolean singleton;
-/** */
+/** Component class */
private volatile Class cls;
-/** */
+/** Properties */
private volatile Map props;
/** */
private transient T instance;
/**
- *
+ * Default constructor.
*/
public IgniteReflectionFactory() {
// No-op.
@@ -98,6 +163,9 @@ public class IgniteReflectionFactory implements
Factory {
}
/**
+ * Gets a map of properties. Map contains entries of component class field
name
+ * to value of the filed which will be used as initial value.
+ *
* @return Properties.
*/
public Map getProperties() {
@@ -105,6 +173,9 @@ public class I
[25/27] incubator-ignite git commit: ignite-950: fixed hangning detected by Service related tests
ignite-950: fixed hangning detected by Service related tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d8900f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d8900f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d8900f7
Branch: refs/heads/ignite-950
Commit: 8d8900f77d6d1428309e256edb5b6f09d98b92a6
Parents: 9a46a71
Author: Denis Magda
Authored: Wed Jun 24 09:06:36 2015 +0300
Committer: Denis Magda
Committed: Wed Jun 24 09:06:36 2015 +0300
--
.../optimized/OptimizedMarshallerExt.java | 17 +++--
.../optimized/OptimizedObjectInputStreamExt.java | 6 --
.../optimized/OptimizedObjectOutputStreamExt.java | 11 +++
.../GridServiceProcessorMultiNodeSelfTest.java | 2 +-
4 files changed, 27 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d8900f7/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
index 7d90581..ce9b9db 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
@@ -19,9 +19,12 @@ package org.apache.ignite.marshaller.optimized;
import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.marshaller.*;
+import org.apache.ignite.services.*;
import org.jetbrains.annotations.*;
import java.io.*;
+import java.util.*;
import static
org.apache.ignite.marshaller.optimized.OptimizedClassDescriptor.*;
@@ -88,6 +91,16 @@ public class OptimizedMarshallerExt extends
OptimizedMarshaller {
}
/**
+ * Checks whether fields indexing is excluded for class.
+ *
+ * @param cls Class.
+ * @return {@code true} if excluded.
+ */
+static boolean isFieldsIndexingExcludedForClass(MarshallerContext ctx,
Class cls) {
+return ctx.isSystemType(cls.getName()) ||
Service.class.isAssignableFrom(cls);
+}
+
+/**
* Enables fields indexing for the object of the given {@code cls}.
*
* If enabled then a footer will be added during marshalling of an object
of the given {@code cls} to the end of
@@ -100,7 +113,7 @@ public class OptimizedMarshallerExt extends
OptimizedMarshaller {
public boolean enableFieldsIndexing(Class cls) throws
IgniteCheckedException {
assert metaHandler != null;
-if (ctx.isSystemType(cls.getName()))
+if (isFieldsIndexingExcludedForClass(ctx, cls))
return false;
if (OptimizedMarshalAware.class.isAssignableFrom(cls))
@@ -142,7 +155,7 @@ public class OptimizedMarshallerExt extends
OptimizedMarshaller {
public boolean fieldsIndexingEnabled(Class cls) {
assert metaHandler != null;
-if (ctx.isSystemType(cls.getName()))
+if (isFieldsIndexingExcludedForClass(ctx, cls))
return false;
if (OptimizedMarshalAware.class.isAssignableFrom(cls))
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d8900f7/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStreamExt.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStreamExt.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStreamExt.java
index 34ca279..49c9339 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStreamExt.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStreamExt.java
@@ -35,8 +35,10 @@ public class OptimizedObjectInputStreamExt extends
OptimizedObjectInputStream {
/** {@inheritDoc} */
@Override protected void skipFooter(Class cls) throws IOException {
-if (!ctx.isSystemType(cls.getName()) && metaHandler != null &&
-metaHandler.metadata(resolveTypeId(cls.getName(), mapper)) !=
null) {
+if (isFieldsIndexingExcludedForClass(ctx, cls))
+return;
+
+if (metaHandler != null &&
metaHandler.metadata(resolveTypeId(cls.getName(), mapper)) != null) {
short footerLen = in.readShort();
if (footerLen != EMPTY_FOOTER)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d8900f7/modules/core/src/main/java
[04/27] incubator-ignite git commit: # ignite-sprint-7 do not run TaskDiscoveryListener in discovery thread
# ignite-sprint-7 do not run TaskDiscoveryListener in discovery thread
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/044f17de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/044f17de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/044f17de
Branch: refs/heads/ignite-950
Commit: 044f17deae5a16c0d463633b75640d04a125f5d2
Parents: c6a0f24
Author: sboikov
Authored: Thu Jun 18 15:36:44 2015 +0300
Committer: sboikov
Committed: Thu Jun 18 15:36:44 2015 +0300
--
.../processors/task/GridTaskProcessor.java | 22 ++-
.../GridTaskFailoverAffinityRunTest.java| 170 +++
.../testsuites/IgniteComputeGridTestSuite.java | 1 +
3 files changed, 184 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/044f17de/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 88713a1..bb9ff50 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -1171,17 +1171,21 @@ public class GridTaskProcessor extends
GridProcessorAdapter {
@Override public void onEvent(Event evt) {
assert evt.type() == EVT_NODE_FAILED || evt.type() ==
EVT_NODE_LEFT;
-UUID nodeId = ((DiscoveryEvent)evt).eventNode().id();
+final UUID nodeId = ((DiscoveryEvent)evt).eventNode().id();
-lock.readLock();
+ctx.closure().runLocalSafe(new Runnable() {
+@Override public void run() {
+lock.readLock();
-try {
-for (GridTaskWorker task : tasks.values())
-task.onNodeLeft(nodeId);
-}
-finally {
-lock.readUnlock();
-}
+try {
+for (GridTaskWorker task : tasks.values())
+task.onNodeLeft(nodeId);
+}
+finally {
+lock.readUnlock();
+}
+}
+}, false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/044f17de/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
new file mode 100644
index 000..7ddd966
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
@@ -0,0 +1,170 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
+
+/**
+ *
+ */
+public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
+/** */
+private static TcpDiscoveryIpFinder ipFinder =
[21/27] incubator-ignite git commit: [IGNITE-980]: added missing file
[IGNITE-980]: added missing file
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2bb6e0f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2bb6e0f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2bb6e0f8
Branch: refs/heads/ignite-950
Commit: 2bb6e0f887c99de70e479c48992f5a0a86cbf5ec
Parents: 3b49184
Author: iveselovskiy
Authored: Tue Jun 23 15:02:23 2015 +0300
Committer: iveselovskiy
Committed: Tue Jun 23 15:02:23 2015 +0300
--
.../hadoop/fs/HadoopFileSystemCacheUtils.java | 241 +++
1 file changed, 241 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bb6e0f8/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtils.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtils.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtils.java
new file mode 100644
index 000..f94b932
--- /dev/null
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtils.java
@@ -0,0 +1,241 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.fs;
+
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.fs.*;
+import org.apache.hadoop.mapreduce.*;
+import org.apache.ignite.*;
+import org.apache.ignite.hadoop.fs.v1.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.net.*;
+
+/**
+ * File system cache utility methods used by Map-Reduce tasks and jobs.
+ */
+public class HadoopFileSystemCacheUtils {
+/**
+ * A common static factory method. Creates new HadoopLazyConcurrentMap.
+ * @return a new HadoopLazyConcurrentMap.
+ */
+public static HadoopLazyConcurrentMap
createHadoopLazyConcurrentMap() {
+return new HadoopLazyConcurrentMap<>(
+new HadoopLazyConcurrentMap.ValueFactory()
{
+@Override public FileSystem createValue(FsCacheKey key) {
+try {
+assert key != null;
+
+// Explicitly disable FileSystem caching:
+URI uri = key.uri();
+
+String scheme = uri.getScheme();
+
+// Copy the configuration to avoid altering the
external object.
+Configuration cfg = new
Configuration(key.configuration());
+
+String prop =
HadoopFileSystemsUtils.disableFsCachePropertyName(scheme);
+
+cfg.setBoolean(prop, true);
+
+return FileSystem.get(uri, cfg, key.user());
+}
+catch (IOException | InterruptedException ioe) {
+throw new IgniteException(ioe);
+}
+}
+}
+);
+}
+
+/**
+ * Gets non-null user name as per the Hadoop viewpoint.
+ * @param cfg the Hadoop job configuration, may be null.
+ * @return the user name, never null.
+ */
+private static String getMrHadoopUser(Configuration cfg) throws
IOException {
+String user = cfg.get(MRJobConfig.USER_NAME);
+
+if (user == null)
+user = IgniteHadoopFileSystem.getFsHadoopUser();
+
+return user;
+}
+
+/**
+ * Common method to get the V1 file system in MapRed engine.
+ * It gets the filesystem for the user specified in the
+ * configuration with {@link MRJobConfig#USER_NAME} property.
+ * The file systems are created and cached in the given map upon first
request.
+ *
+ * @param uri The file system uri.
+ * @param cfg The configuration.
+ * @param map The caching map.
+
[17/27] incubator-ignite git commit: # ignite-sprint-7 disabled hanging test
# ignite-sprint-7 disabled hanging 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/c7ba1541
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7ba1541
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7ba1541
Branch: refs/heads/ignite-950
Commit: c7ba1541959b78451e81fb701550894b09fe6eb9
Parents: 1c66078
Author: sboikov
Authored: Tue Jun 23 12:55:17 2015 +0300
Committer: sboikov
Committed: Tue Jun 23 12:55:17 2015 +0300
--
.../replicated/GridCacheReplicatedFailoverSelfTest.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7ba1541/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
index 3461dd4..4269ea6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java
@@ -28,6 +28,11 @@ import static org.apache.ignite.cache.CacheMode.*;
*/
public class GridCacheReplicatedFailoverSelfTest extends
GridCacheAbstractFailoverTxSelfTest {
/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-882";);
+}
+
+/** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
return REPLICATED;
}
[20/27] incubator-ignite git commit: [IGNITE-980]: Investigate if we should close() the FileSystems in MapRed task implementations.
[IGNITE-980]: Investigate if we should close() the FileSystems in MapRed task
implementations.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3b49184b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b49184b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b49184b
Branch: refs/heads/ignite-950
Commit: 3b49184b48ca55d5cf4dcdd7485ab8aba1bb9cff
Parents: 36433bc
Author: iveselovskiy
Authored: Tue Jun 23 13:58:06 2015 +0300
Committer: iveselovskiy
Committed: Tue Jun 23 13:58:06 2015 +0300
--
.../processors/hadoop/HadoopJobInfo.java| 4 +-
.../hadoop/counter/HadoopCounterWriter.java | 5 +-
modules/hadoop/pom.xml | 78 --
.../fs/IgniteHadoopFileSystemCounterWriter.java | 9 +-
.../processors/hadoop/HadoopClassLoader.java| 29 +++
.../processors/hadoop/HadoopDefaultJobInfo.java | 27 +--
.../internal/processors/hadoop/HadoopUtils.java | 237 ---
.../hadoop/SecondaryFileSystemProvider.java | 3 +-
.../hadoop/fs/HadoopFileSystemsUtils.java | 11 +
.../hadoop/fs/HadoopLazyConcurrentMap.java | 5 +
.../hadoop/jobtracker/HadoopJobTracker.java | 25 +-
.../child/HadoopChildProcessRunner.java | 3 +-
.../processors/hadoop/v2/HadoopV2Job.java | 84 ++-
.../hadoop/v2/HadoopV2JobResourceManager.java | 22 +-
.../hadoop/v2/HadoopV2TaskContext.java | 37 ++-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 5 +-
.../processors/hadoop/HadoopMapReduceTest.java | 2 +-
.../processors/hadoop/HadoopTasksV1Test.java| 7 +-
.../processors/hadoop/HadoopTasksV2Test.java| 7 +-
.../processors/hadoop/HadoopV2JobSelfTest.java | 6 +-
.../collections/HadoopAbstractMapTest.java | 3 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +-
23 files changed, 237 insertions(+), 377 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b49184b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
index 51faf5d..d3735d5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
@@ -55,12 +55,14 @@ public interface HadoopJobInfo extends Serializable {
* This method will be called once for the same ID on one node, though it
can be called on the same host
* multiple times from different processes (in case of multiple nodes on
the same host or external execution).
*
+ * @param jobCls The job class.
* @param jobId Job ID.
* @param log Logger.
* @return Job.
* @throws IgniteCheckedException If failed.
*/
-HadoopJob createJob(HadoopJobId jobId, IgniteLogger log) throws
IgniteCheckedException;
+public HadoopJob createJob(Class jobCls,
+HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException;
/**
* @return Number of reducers configured for job.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b49184b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
index ce67c57..f21a1e6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCounterWriter.java
@@ -28,10 +28,9 @@ public interface HadoopCounterWriter {
/**
* Writes counters of given job to some statistics storage.
*
- * @param jobInfo Job info.
- * @param jobId Job id.
+ * @param job The job.
* @param cntrs Counters.
* @throws IgniteCheckedException If failed.
*/
-public void write(HadoopJobInfo jobInfo, HadoopJobId jobId, HadoopCounters
cntrs) throws IgniteCheckedException;
+public void write(HadoopJob job, HadoopCounters cntrs) throws
IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b49184b/modules/hadoop/pom.xml
--
[11/27] incubator-ignite git commit: # ignite-sprint-7 do not call ping from exchange worker
# ignite-sprint-7 do not call ping from exchange worker
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8fa9d3dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8fa9d3dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8fa9d3dd
Branch: refs/heads/ignite-950
Commit: 8fa9d3dd9214e85748a6b7b900fa2433079ce246
Parents: d006389
Author: sboikov
Authored: Fri Jun 19 14:37:37 2015 +0300
Committer: sboikov
Committed: Fri Jun 19 14:37:37 2015 +0300
--
.../processors/cache/GridCacheIoManager.java| 64 --
.../GridCachePartitionExchangeManager.java | 70 +---
.../GridCacheAbstractFailoverSelfTest.java | 6 +-
3 files changed, 79 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fa9d3dd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index eef9fde..74a4512 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -323,7 +323,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
* Processes failed messages.
* @param nodeId niode id.
* @param msg message.
- * @throws IgniteCheckedException
+ * @throws IgniteCheckedException If failed.
*/
private void processFailedMessage(UUID nodeId, GridCacheMessage msg)
throws IgniteCheckedException {
GridCacheContext ctx = cctx.cacheContext(msg.cacheId());
@@ -511,6 +511,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
* @param cacheMsg Cache message to get start future.
* @return Preloader start future.
*/
+@SuppressWarnings("unchecked")
private IgniteInternalFuture startFuture(GridCacheMessage
cacheMsg) {
int cacheId = cacheMsg.cacheId();
@@ -574,6 +575,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
*
* @param node Node to send the message to.
* @param msg Message to send.
+ * @param plc IO policy.
* @throws IgniteCheckedException If sending failed.
* @throws ClusterTopologyCheckedException If receiver left.
*/
@@ -734,6 +736,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
*
* @param nodeId ID of node to send the message to.
* @param msg Message to send.
+ * @param plc IO policy.
* @throws IgniteCheckedException If sending failed.
*/
public void send(UUID nodeId, GridCacheMessage msg, GridIoPolicy plc)
throws IgniteCheckedException {
@@ -795,8 +798,41 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
}
/**
+ * Sends message without retries and node ping in case of error.
+ *
+ * @param node Node to send message to.
+ * @param msg Message.
+ * @param plc IO policy.
+ * @throws IgniteCheckedException If send failed.
+ */
+public void sendNoRetry(ClusterNode node,
+GridCacheMessage msg,
+GridIoPolicy plc)
+throws IgniteCheckedException
+{
+assert node != null;
+assert msg != null;
+
+onSend(msg, null);
+
+try {
+cctx.gridIO().send(node, TOPIC_CACHE, msg, plc);
+
+if (log.isDebugEnabled())
+log.debug("Sent cache message [msg=" + msg + ", node=" +
U.toShortString(node) + ']');
+}
+catch (IgniteCheckedException e) {
+if (!cctx.discovery().alive(node.id()))
+throw new ClusterTopologyCheckedException("Node left grid
while sending message to: " + node.id(), e);
+else
+throw e;
+}
+}
+
+/**
* Adds message handler.
*
+ * @param cacheId Cache ID.
* @param type Type of message.
* @param c Handler.
*/
@@ -846,29 +882,15 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
idxClsHandlers.remove(cacheId);
-for (Iterator iterator = clsHandlers.keySet().iterator();
iterator.hasNext(); ) {
-ListenerKey key = iterator.next();
+for (Iterator iter = clsHandlers.keySet().iterator();
iter.hasNext(); ) {
+ListenerKey key = iter.next();
if (key.cacheId == cacheId)
-iterator.remove();
+iter.r
[27/27] incubator-ignite git commit: ignite-950: excluded ComputeTask from footer addition
ignite-950: excluded ComputeTask from footer addition
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca8d66e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca8d66e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca8d66e9
Branch: refs/heads/ignite-950
Commit: ca8d66e9219c69dc27f91e42cc375e2e928ce5b5
Parents: 9eef6b7
Author: Denis Magda
Authored: Wed Jun 24 09:21:58 2015 +0300
Committer: Denis Magda
Committed: Wed Jun 24 09:21:58 2015 +0300
--
.../ignite/marshaller/optimized/OptimizedMarshallerExt.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca8d66e9/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
index ce9b9db..9ed2d0a 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
@@ -18,6 +18,7 @@
package org.apache.ignite.marshaller.optimized;
import org.apache.ignite.*;
+import org.apache.ignite.compute.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.services.*;
@@ -97,7 +98,8 @@ public class OptimizedMarshallerExt extends
OptimizedMarshaller {
* @return {@code true} if excluded.
*/
static boolean isFieldsIndexingExcludedForClass(MarshallerContext ctx,
Class cls) {
-return ctx.isSystemType(cls.getName()) ||
Service.class.isAssignableFrom(cls);
+return ctx.isSystemType(cls.getName()) ||
Service.class.isAssignableFrom(cls) ||
+ComputeTask.class.isAssignableFrom(cls);
}
/**
incubator-ignite git commit: # ignite-1023 Add example for visorcmd start command.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1023 [created] 08cba6b52
# ignite-1023 Add example for visorcmd start command.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08cba6b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08cba6b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08cba6b5
Branch: refs/heads/ignite-1023
Commit: 08cba6b52158fa6786573d11b0d66972008a20c7
Parents: b3e2bd4
Author: Andrey
Authored: Wed Jun 24 14:47:37 2015 +0700
Committer: Andrey
Committed: Wed Jun 24 14:49:28 2015 +0700
--
bin/include/visorcmd/node_startup_by_ssh.ini| 44
.../util/nodestart/StartNodeCallableImpl.java | 4 +-
.../commands/start/VisorStartCommand.scala | 4 +-
3 files changed, 50 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08cba6b5/bin/include/visorcmd/node_startup_by_ssh.ini
--
diff --git a/bin/include/visorcmd/node_startup_by_ssh.ini
b/bin/include/visorcmd/node_startup_by_ssh.ini
new file mode 100644
index 000..c460417
--- /dev/null
+++ b/bin/include/visorcmd/node_startup_by_ssh.ini
@@ -0,0 +1,44 @@
+# section with settings for host 1
+[host1]
+# ip address or host name
+host=192.168.1.1
+# ssh port
+port=2200
+# ssh login
+uname=userName
+# ssh password
+passwd=password
+# ssh key path
+key=~/.ssh/id_rsa
+# start node count
+nodes=1
+# ignite home path
+igniteHome=/usr/lib/ignite
+# ignite config path
+cfg=examples/example-ignite.xml
+# ignite node start script
+script=bin/ignite.sh
+
+# section with settings for host 2
+[host2]
+# ip address or host name
+host=192.168.1.2
+
+# section with default settings. Used if value not defined in host section.
+[defaults]
+# ssh port
+port=22
+# ssh login
+uname=userName
+# ssh password
+passwd=passwd3
+# ssh key path
+key=~/.ssh/id_rsa
+# ssh key path
+nodes=3
+# ignite home path
+igniteHome=/usr/lib/ignite
+# ignite config path
+cfg=examples/example-ignite.xml
+# ignite node start script
+script=bin/ignite.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08cba6b5/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
--
diff --git
a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
index 7c6010f..a4b71ef 100644
---
a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
+++
b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
@@ -230,7 +230,9 @@ public class StartNodeCallableImpl implements
StartNodeCallable {
*/
private String env(Session ses, String name, String dflt) throws
JSchException {
try {
-return exec(ses, "echo " + name);
+String value = exec(ses, "echo " + name);
+
+return F.isEmpty(value) ? dflt : value;
}
catch (IOException ignored) {
return dflt;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08cba6b5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
index 9365592..ce1a2ab 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
@@ -319,6 +319,7 @@ class VisorStartCommand extends VisorConsoleCommand {
println("NOTE:")
println("- Successful start attempt DOES NOT mean that node
actually started.")
+println("- Log files are stored in $TMPDIR/ignite-startNodes
folder or /tmp/ignite-startNodes if $TMPDIR is not set.")
println("- For large topologies (> 100s nodes) it can take
over 10 minutes for all nodes to start.")
println("- See individual node log for details.")
}
@@ -346,7 +347,8 @@ object VisorStartCommand {
),
args = List(
"-f=" -> List(
-"Path to INI file that contains topology specification."
+"Path to INI file that contains topology specification.",
+"Ex
[09/10] incubator-ignite git commit: Merge branch 'ignite-sprint-6' into ignite-yardstick-client
Merge branch 'ignite-sprint-6' into ignite-yardstick-client
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d7af8f27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d7af8f27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d7af8f27
Branch: refs/heads/ignite-yardstick-client
Commit: d7af8f2759d830574c7098f4714c6cc263229633
Parents: 87c7df7 285d790
Author: nikolay_tikhonov
Authored: Wed Jun 24 11:25:04 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed Jun 24 11:25:04 2015 +0300
--
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../ignite/internal/MarshallerContextImpl.java | 12 +-
.../GridDhtPartitionsExchangeFuture.java| 49 ++--
.../communication/tcp/TcpCommunicationSpi.java | 61 ++
.../tcp/TcpCommunicationSpiMBean.java | 8 ++
.../ignite/spi/discovery/tcp/ClientImpl.java| 68 +++
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++
.../GridTcpCommunicationSpiConfigSelfTest.java | 1 -
.../testsuites/IgniteCacheTestSuite3.java | 1 +
.../cache/IgniteCacheOffheapEvictQueryTest.java | 17 +++
10 files changed, 278 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7af8f27/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 77d7160,0c2c059..7961a71
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@@ -650,10 -671,8 +676,10 @@@ class ClientImpl extends TcpDiscoveryIm
private void joinError(IgniteSpiException err) {
assert err != null;
- joinErr = err;
+ joinErr.compareAndSet(null, err);
+log.error("ClientImpl.joinError", err);
+
joinLatch.countDown();
}
[08/10] incubator-ignite git commit: # ignite-sprint-6 race in tcp communication connection, retry full partition map send
# ignite-sprint-6 race in tcp communication connection, retry full partition
map send
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/285d790f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/285d790f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/285d790f
Branch: refs/heads/ignite-yardstick-client
Commit: 285d790ff0ce597fde65a778c381e59a4f1c89aa
Parents: 1605996
Author: sboikov
Authored: Mon Jun 22 16:40:08 2015 +0300
Committer: sboikov
Committed: Mon Jun 22 16:58:01 2015 +0300
--
.../GridDhtPartitionsExchangeFuture.java| 49 +++-
.../communication/tcp/TcpCommunicationSpi.java | 12 +
.../GridTcpCommunicationSpiConfigSelfTest.java | 1 -
3 files changed, 49 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/285d790f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 9f18c98..7c780b0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1078,18 +1078,7 @@ public class GridDhtPartitionsExchangeFuture extends
GridFutureAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/285d790f/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 1035ee5..addf243d 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
@@ -1748,6 +1748,18 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
assert old == null : "Client already created "
+
"[node=" + node + ", client=" +
client0 + ", oldClient=" + old + ']';
+
+if (client0 instanceof
GridTcpNioCommunicationClient) {
+GridTcpNioCommunicationClient tcpClient =
((GridTcpNioCommunicationClient)client0);
+
+if (tcpClient.session().closeTime() > 0 &&
clients.remove(nodeId, client0)) {
+if (log.isDebugEnabled())
+log.debug("Session was closed
after client creation, will retry " +
+"[node=" + node + ", client="
+ client0 + ']');
+
+client0 = null;
+}
+}
}
else
U.sleep(200);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/285d790f/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
index c4a0916..4062931 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
@@ -37,7 +37,6 @@ public class GridTcpCommunicationSpiConfigSelfTest extends
GridSpiAbstractConfig
checkNegativeSpiProperty(new TcpCommunicationSpi(),
"messageQueueLimit", -1);
checkNegativeSpiProperty(new TcpCommunicationSpi(), "reconnectCount",
0);
checkNegativeSpiProperty(new TcpCommunicationSpi(), "selectorsCount",
0);
-checkNegativeSpiProperty(new TcpCommunicationSpi(),
"minimumBufferedMessageCount", -1);
checkNeg
[06/10] incubator-ignite git commit: Merge branch 'ignite-gg-10449' into ignite-sprint-6
Merge branch 'ignite-gg-10449' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de0930d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de0930d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de0930d3 Branch: refs/heads/ignite-yardstick-client Commit: de0930d3b92141a360ea6a2cc346035158572dcf Parents: a4ce455 7c1ecc3 Author: nikolay_tikhonov Authored: Mon Jun 22 14:05:28 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Jun 22 14:05:28 2015 +0300 -- .../ignite/spi/discovery/tcp/ClientImpl.java| 23 .../cache/IgniteCacheOffheapEvictQueryTest.java | 17 +++ 2 files changed, 40 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de0930d3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java --
[07/10] incubator-ignite git commit: #IGNITE Added message on init stop.
#IGNITE Added message on init stop.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/16059962
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/16059962
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/16059962
Branch: refs/heads/ignite-yardstick-client
Commit: 16059962e303f7580c6524b1e0f93c2dcce9eaa4
Parents: de0930d
Author: nikolay_tikhonov
Authored: Mon Jun 22 15:30:48 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Jun 22 15:30:48 2015 +0300
--
.../ignite/internal/MarshallerContextImpl.java | 12 +-
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++
.../testsuites/IgniteCacheTestSuite3.java | 1 +
3 files changed, 130 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16059962/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 48f24ac..9f7c983 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -124,10 +124,18 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
/** {@inheritDoc} */
@Override protected String className(int id) throws IgniteCheckedException
{
-if (cache == null)
+GridCacheAdapter cache0 = cache;
+
+if (cache0 == null) {
U.awaitQuiet(latch);
-String clsName = cache.get(id);
+cache0 = cache;
+
+if (cache0 == null)
+throw new IllegalStateException("Failed to initialize
marshaller context (grid is stopping).");
+}
+
+String clsName = cache0.get(id);
if (clsName == null) {
File file = new File(workDir, id + ".classname");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16059962/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeStopSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeStopSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeStopSelfTest.java
new file mode 100644
index 000..c56ad1c
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeStopSelfTest.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Test cache operations with daemon node.
+ */
+public class GridCacheDaemonNodeStopSelfTest extends GridCommonAbstractTest {
+/** */
+private static TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** Daemon flag. */
+protected boolean daemon;
+
+/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+super.beforeTest();
+
+daemon = false;
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration c = super.getConfiguration(gridName);
+
+c.setDae
[10/10] incubator-ignite git commit: #ignite-yardstick-client change benchmark.
#ignite-yardstick-client change benchmark.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f6db614
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f6db614
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f6db614
Branch: refs/heads/ignite-yardstick-client
Commit: 8f6db614995b3f6578caf95c61718dfb18d6a79a
Parents: d7af8f2
Author: nikolay_tikhonov
Authored: Wed Jun 24 11:27:35 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed Jun 24 11:27:35 2015 +0300
--
.../yardstick/IgniteAbstractBenchmark.java | 20 ++--
.../IgnitePutGetClientPerThreadBenchmark.java | 2 --
2 files changed, 10 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f6db614/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
index b9e553f..d56b431 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
@@ -43,16 +43,16 @@ public abstract class IgniteAbstractBenchmark extends
BenchmarkDriverAdapter {
jcommander(cfg.commandLineArguments(), args, "");
-if (Ignition.state() != IgniteState.STARTED) {
-node = new IgniteNode(false);
-
-node.start(cfg);
-}
-else
-// Support for mixed benchmarks mode.
-node = new IgniteNode(false, Ignition.ignite());
-
-waitForNodes();
+//if (Ignition.state() != IgniteState.STARTED) {
+//node = new IgniteNode(false);
+//
+//node.start(cfg);
+//}
+//else
+//// Support for mixed benchmarks mode.
+//node = new IgniteNode(false, Ignition.ignite());
+//
+//waitForNodes();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f6db614/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
index 5aa8550..e33b7b7 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
@@ -50,8 +50,6 @@ public class IgnitePutGetClientPerThreadBenchmark extends
IgniteCacheAbstractBen
nodes.put(idSeq.getAndIncrement(), node);
}
-else
-TimeUnit.SECONDS.sleep(1);
int key = nextRandom(args.range());
[04/10] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4ce455b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4ce455b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4ce455b Branch: refs/heads/ignite-yardstick-client Commit: a4ce455bbff7dbbf1084a7e9cc60424b53396471 Parents: 7c70267 6f5e676 Author: Yakov Zhdanov Authored: Mon Jun 22 12:50:21 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jun 22 12:50:21 2015 +0300 -- .../ignite/spi/discovery/tcp/ClientImpl.java| 45 ++-- 1 file changed, 23 insertions(+), 22 deletions(-) --
[01/10] incubator-ignite git commit: # ignite-sprint-6 minor
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-yardstick-client 87c7df790 -> 8f6db6149
# ignite-sprint-6 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6f5e676a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6f5e676a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6f5e676a
Branch: refs/heads/ignite-yardstick-client
Commit: 6f5e676a2599a4e5441dc51f67763bdd10b2db24
Parents: 1cc
Author: sboikov
Authored: Mon Jun 22 11:06:38 2015 +0300
Committer: sboikov
Committed: Mon Jun 22 11:06:38 2015 +0300
--
.../ignite/spi/discovery/tcp/ClientImpl.java| 45 ++--
1 file changed, 23 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f5e676a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index e255e08..b524e13 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -36,6 +36,7 @@ import java.io.*;
import java.net.*;
import java.util.*;
import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.events.EventType.*;
@@ -79,7 +80,7 @@ class ClientImpl extends TcpDiscoveryImpl {
private volatile long topVer;
/** Join error. Contains error what occurs on join process. */
-private IgniteSpiException joinErr;
+private final AtomicReference joinErr = new
AtomicReference<>();
/** Joined latch. */
private final CountDownLatch joinLatch = new CountDownLatch(1);
@@ -171,8 +172,10 @@ class ClientImpl extends TcpDiscoveryImpl {
try {
joinLatch.await();
-if (joinErr != null)
-throw joinErr;
+IgniteSpiException err = joinErr.get();
+
+if (err != null)
+throw err;
}
catch (InterruptedException e) {
throw new IgniteSpiException("Thread has been interrupted.", e);
@@ -645,7 +648,7 @@ class ClientImpl extends TcpDiscoveryImpl {
private void joinError(IgniteSpiException err) {
assert err != null;
-joinErr = err;
+joinErr.compareAndSet(null, err);
joinLatch.countDown();
}
@@ -1000,8 +1003,16 @@ class ClientImpl extends TcpDiscoveryImpl {
if (log.isDebugEnabled())
log.error("Reconnect error [join=" + join + ",
timeout=" + timeout + ']', e);
-if (timeout > 0 && (U.currentTimeMillis() - startTime)
> timeout)
+if (timeout > 0 && (U.currentTimeMillis() - startTime)
> timeout) {
+String msg = join ? "Failed to connect to cluster
(consider increasing 'joinTimeout' " +
+"configuration property) [joinTimeout=" +
spi.joinTimeout + ", err=" + e + ']' :
+"Failed to reconnect to cluster (consider
increasing 'networkTimeout' " +
+"configuration property)
[networkTimeout=" + spi.netTimeout + ", err=" + e + ']';
+
+U.warn(log, msg);
+
throw e;
+}
else
U.warn(log, "Failed to reconnect to cluster (will
retry): " + e);
}
@@ -1062,9 +1073,7 @@ class ClientImpl extends TcpDiscoveryImpl {
final Socket sock = joinTopology(false, spi.joinTimeout);
if (sock == null) {
-joinErr = new IgniteSpiException("Join process timed
out.");
-
-joinLatch.countDown();
+joinError(new IgniteSpiException("Join process timed
out."));
return;
}
@@ -1089,11 +1098,9 @@ class ClientImpl extends TcpDiscoveryImpl {
if (msg == JOIN_TIMEOUT) {
if (joinLatch.getCount() > 0) {
-joinErr = new IgniteSpiException("Join process
timed out, did not receive response for " +
+joinError(new IgniteSpiException("Join process
timed out, did not receive response for " +
"join request (consider increasing
'joinTimeout' configuration property) " +
-"[joinTim
[03/10] incubator-ignite git commit: # review droppng of slow clients
# review droppng of slow clients
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c70267d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c70267d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c70267d
Branch: refs/heads/ignite-yardstick-client
Commit: 7c70267d2b4b7fc3fb7a1efda1ee785cebebcc41
Parents: 1cc
Author: Yakov Zhdanov
Authored: Mon Jun 22 12:49:58 2015 +0300
Committer: Yakov Zhdanov
Committed: Mon Jun 22 12:49:58 2015 +0300
--
.../apache/ignite/IgniteSystemProperties.java | 3 ++
.../communication/tcp/TcpCommunicationSpi.java | 49 ++--
.../tcp/TcpCommunicationSpiMBean.java | 8
3 files changed, 36 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c70267d/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index b166f39..542fa30 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -236,7 +236,10 @@ public final class IgniteSystemProperties {
/**
* System property to disable buffered communication if node sends less
messages count than
* specified by this property. Default value is {@code 512}.
+ *
+ * @deprecated Not used anymore.
*/
+@Deprecated
public static final String IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT =
"IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT";
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c70267d/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 1ec2128..1035ee5 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
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.util.ipc.*;
import org.apache.ignite.internal.util.ipc.shmem.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
@@ -51,7 +50,6 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -657,9 +655,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** Slow client queue limit. */
private int slowClientQueueLimit;
-/** Min buffered message count. */
-private int minBufferedMsgCnt =
Integer.getInteger(IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT, 512);
-
/** NIO server. */
private GridNioServer nioSrvr;
@@ -935,24 +930,29 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
*
* @param connBufSize Connection buffer size.
* @see #setConnectionBufferFlushFrequency(long)
+ * @deprecated Not used any more.
*/
+@Deprecated
@IgniteSpiConfiguration(optional = true)
public void setConnectionBufferSize(int connBufSize) {
// No-op.
}
/** {@inheritDoc} */
+@Deprecated
@Override public int getConnectionBufferSize() {
return 0;
}
/** {@inheritDoc} */
+@Deprecated
@IgniteSpiConfiguration(optional = true)
@Override public void setConnectionBufferFlushFrequency(long
connBufFlushFreq) {
// No-op.
}
/** {@inheritDoc} */
+@Deprecated
@Override public long getConnectionBufferFlushFrequency() {
return 0;
}
@@ -1156,13 +1156,14 @@ public class TcpCommunicationSpi extends
IgniteSpiAdapter
/**
* Sets slow client queue limit.
*
- * When set to a positive number, communication SPI will monitor clients
outbound queue sizes and will drop
+ * When set to a positive number, communication SPI will monitor clients
outbound message queue sizes and will drop
* those clients whose queue exceeded this limit.
*
* Usually this value should be set to t
[05/10] incubator-ignite git commit: #IGNITE-GG-10449 Fixed license.
#IGNITE-GG-10449 Fixed license. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c1ecc3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c1ecc3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c1ecc3d Branch: refs/heads/ignite-yardstick-client Commit: 7c1ecc3dd2e240e48958c8fb1fd812a6df7e92b5 Parents: a3d8e60 Author: nikolay_tikhonov Authored: Mon Jun 22 13:15:55 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Jun 22 13:15:55 2015 +0300 -- .../cache/IgniteCacheOffheapEvictQueryTest.java| 17 + 1 file changed, 17 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c1ecc3d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java index 72bfcaa..45d744e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*;
[02/10] incubator-ignite git commit: #IGNITE-GG-10449 marshal credentials in client discovery.
#IGNITE-GG-10449 marshal credentials in client discovery.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a3d8e603
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a3d8e603
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a3d8e603
Branch: refs/heads/ignite-yardstick-client
Commit: a3d8e603a5c9a7fbf3f81a7dd2aded2a8139f578
Parents: 1cc
Author: nikolay_tikhonov
Authored: Mon Jun 22 11:33:53 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Jun 22 11:33:53 2015 +0300
--
.../ignite/spi/discovery/tcp/ClientImpl.java| 23
1 file changed, 23 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3d8e603/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index e255e08..68e5dbd 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -362,6 +362,9 @@ class ClientImpl extends TcpDiscoveryImpl {
long startTime = U.currentTimeMillis();
+// Marshal credentials for backward compatibility and security.
+marshalCredentials(locNode);
+
while (true) {
if (Thread.currentThread().isInterrupted())
throw new InterruptedException();
@@ -541,6 +544,26 @@ class ClientImpl extends TcpDiscoveryImpl {
return null;
}
+/**
+ * Marshalls credentials with discovery SPI marshaller (will replace
attribute value).
+ *
+ * @param node Node to marshall credentials for.
+ * @throws IgniteSpiException If marshalling failed.
+ */
+private void marshalCredentials(TcpDiscoveryNode node) throws
IgniteSpiException {
+try {
+// Use security-unsafe getter.
+Map attrs = new HashMap<>(node.getAttributes());
+
+attrs.put(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS,
+
spi.marsh.marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS)));
+
+node.setAttributes(attrs);
+}
+catch (IgniteCheckedException e) {
+throw new IgniteSpiException("Failed to marshal node security
credentials: " + node.id(), e);
+}
+}
/**
* @param topVer New topology version.
incubator-ignite git commit: ignite-950: performance improvements
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-950 ca8d66e92 -> f632f1d95
ignite-950: performance improvements
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f632f1d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f632f1d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f632f1d9
Branch: refs/heads/ignite-950
Commit: f632f1d95bbe181b157f8c05bf1857a95fb4b0af
Parents: ca8d66e
Author: Denis Magda
Authored: Wed Jun 24 11:30:10 2015 +0300
Committer: Denis Magda
Committed: Wed Jun 24 11:30:10 2015 +0300
--
.../ignite/internal/util/GridHandleTable.java | 9 ++
.../optimized/OptimizedMarshallerExt.java | 106 ---
.../OptimizedObjectInputStreamExt.java | 6 +-
.../OptimizedObjectOutputStreamExt.java | 6 +-
.../OptimizedObjectStreamSelfTest.java | 3 +-
modules/yardstick/pom.xml | 6 ++
6 files changed, 88 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f632f1d9/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
index 639a5c1..fc117d4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridHandleTable.java
@@ -271,6 +271,15 @@ public class GridHandleTable {
public int length() {
return len;
}
+
+/**
+ * Returns object.
+ *
+ * @return Object.
+ */
+public Object object() {
+return object;
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f632f1d9/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
index 9ed2d0a..684b29b 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExt.java
@@ -25,7 +25,7 @@ import org.apache.ignite.services.*;
import org.jetbrains.annotations.*;
import java.io.*;
-import java.util.*;
+import java.util.concurrent.*;
import static
org.apache.ignite.marshaller.optimized.OptimizedClassDescriptor.*;
@@ -52,6 +52,9 @@ public class OptimizedMarshallerExt extends
OptimizedMarshaller {
public static final byte VARIABLE_LEN = -1;
/** */
+private final static ConcurrentHashMap, Boolean>
indexingEnabledCache = new ConcurrentHashMap<>();
+
+/** */
private volatile OptimizedMarshallerMetaHandler metaHandler;
/**
@@ -103,6 +106,46 @@ public class OptimizedMarshallerExt extends
OptimizedMarshaller {
}
/**
+ * Checks whether fields indexing is enabled for objects of the given
{@code cls}.
+ *
+ * @param cls Class.
+ * @param metaHandler Metadata handler.
+ * @param ctx Marshaller context.
+ * @param clsMap Class map.
+ * @param mapper ID Mapper.
+ * @return {@code true} if fields indexing is enabled.
+ */
+static boolean fieldsIndexingSupported(Class cls,
OptimizedMarshallerMetaHandler metaHandler,
+ MarshallerContext ctx,
ConcurrentMap clsMap,
+ OptimizedMarshallerIdMapper mapper)
{
+Boolean res = indexingEnabledCache.get(cls);
+
+if (res != null)
+return res;
+
+if (isFieldsIndexingExcludedForClass(ctx, cls))
+res = false;
+else if (OptimizedMarshalAware.class.isAssignableFrom(cls))
+res = true;
+else {
+try {
+OptimizedClassDescriptor desc =
OptimizedMarshallerUtils.classDescriptor(clsMap, cls, ctx, mapper);
+
+res = desc.fields() != null &&
desc.fields().fieldsIndexingSupported() && metaHandler != null &&
+metaHandler.metadata(desc.typeId()) != null;
+} catch (IOException e) {
+throw new IgniteException("Failed to load class description: "
+ cls);
+}
+}
+
+synchronized (indexingEnabledCache) {
+indexingEnabledCache.putIfAbsent(cls, res);
incubator-ignite git commit: #ignite-1043: Add tests for read through flag.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-7 b3e2bd488 -> bf1ea21b2
#ignite-1043: Add tests for read through flag.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf1ea21b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf1ea21b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf1ea21b
Branch: refs/heads/ignite-sprint-7
Commit: bf1ea21b2f2ff6964b8e13e821b5194243855ff4
Parents: b3e2bd4
Author: ivasilinets
Authored: Wed Jun 24 11:30:15 2015 +0300
Committer: ivasilinets
Committed: Wed Jun 24 11:30:15 2015 +0300
--
.../processors/cache/GridCacheContext.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../CacheReadThroughAtomicRestartSelfTest.java | 32 +
...heReadThroughLocalAtomicRestartSelfTest.java | 32 +
.../CacheReadThroughLocalRestartSelfTest.java | 32 +
...dThroughReplicatedAtomicRestartSelfTest.java | 32 +
...cheReadThroughReplicatedRestartSelfTest.java | 32 +
.../cache/CacheReadThroughRestartSelfTest.java | 133 +++
.../cache/GridCacheAbstractSelfTest.java| 2 +-
.../IgniteCacheTxStoreSessionTest.java | 4 +
.../testsuites/IgniteCacheTestSuite4.java | 7 +
11 files changed, 307 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf1ea21b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 8a4e3b9..9b7801c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -1377,7 +1377,7 @@ public class GridCacheContext implements
Externalizable {
}
/**
- * @return {@code True} if store read-through mode is enabled.
+ * @return {@code True} if {@link
CacheConfiguration#isLoadPreviousValue()} flag is set.
*/
public boolean loadPreviousValue() {
return cacheCfg.isLoadPreviousValue();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf1ea21b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index bdaa552..e160529 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -958,7 +958,7 @@ public final class GridDhtLockFuture extends
GridCompoundIdentityFuture
*
*/
private void loadMissingFromStore() {
-if (!skipStore && cctx.loadPreviousValue() && cctx.readThrough() &&
(needReturnVal || read)) {
+if (!skipStore && (read || cctx.loadPreviousValue()) &&
cctx.readThrough() && (needReturnVal || read)) {
final Map loadMap = new
LinkedHashMap<>();
final GridCacheVersion ver = version();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf1ea21b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
new file mode 100644
index 000..3ac7c3c
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-1043 [deleted] 7cd588304
[2/7] incubator-ignite git commit: # ignite-1022 fixed test
# ignite-1022 fixed 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/627d0b5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/627d0b5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/627d0b5d
Branch: refs/heads/ignite-965
Commit: 627d0b5d43e78b58ac979a8cadb48ae00f7f0646
Parents: 74dc6d5
Author: sboikov
Authored: Tue Jun 23 11:13:20 2015 +0300
Committer: sboikov
Committed: Tue Jun 23 11:13:20 2015 +0300
--
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 --
...achePartitionedMultiNodeFullApiSelfTest.java | 49 +++-
2 files changed, 38 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/627d0b5d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 8343c64..d40e9e3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -192,11 +192,6 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest
extends GridCachePartitio
// Not needed for near-only cache.
}
-/** {@inheritDoc} */
-@Override public void testNearDhtKeySize() throws Exception {
-fail("https://issues.apache.org/jira/browse/IGNITE-1029";);
-}
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/627d0b5d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index 84594a2..9445f9c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -299,26 +299,53 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest
extends GridCacheParti
info("Generating keys for test...");
-IgniteCache cache0 = jcache(0);
+IgniteEx ignite0 = null;
+IgniteEx ignite1 = null;
+IgniteEx ignite2 = null;
-for (int i = 0; i < 5; i++) {
-while (true) {
-String key = UUID.randomUUID().toString();
-
-if (ignite(0).affinity(null).isPrimary(grid(0).localNode(),
key) &&
-ignite(0).affinity(null).isBackup(grid(1).localNode(),
key)) {
-keys.add(key);
+for (int i = 0; i < gridCount(); i++) {
+IgniteEx ignite = grid(i);
-cache0.put(key, i);
+if (!ignite.configuration().isClientMode()) {
+if (ignite0 == null)
+ignite0 = ignite;
+else if (ignite1 == null)
+ignite1 = ignite;
+else {
+ignite2 = ignite;
break;
}
+
}
}
+assertNotNull(ignite0);
+assertNotNull(ignite1);
+assertNotNull(ignite2);
+
+info("Generating keys for test [nodes=" + ignite0.name() + ", " +
ignite1.name() + ", " + ignite2.name() + ']');
+
+IgniteCache cache0 = ignite0.cache(null);
+
+int val = 0;
+
+for (int i = 0; i < 10_000 && keys.size() < 5; i++) {
+String key = String.valueOf(i);
+
+if (ignite(0).affinity(null).isPrimary(ignite0.localNode(), key) &&
+ignite(0).affinity(null).isBackup(ignite1.localNode(), key)) {
+keys.add(key);
+
+cache0.put(key, val++);
+}
+}
+
+assertEquals(5, keys.size());
+
info("Finished generating keys for test.");
-IgniteCache cache2 = jcache(2);
+IgniteCache cache2 =
[7/7] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-965
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-965 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2880a9c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2880a9c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2880a9c5 Branch: refs/heads/ignite-965 Commit: 2880a9c580f93a3e3cef445d1c7abb177a05980f Parents: bd65dcf bf1ea21 Author: ivasilinets Authored: Wed Jun 24 11:32:08 2015 +0300 Committer: ivasilinets Committed: Wed Jun 24 11:32:08 2015 +0300 -- .../processors/cache/GridCacheContext.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../datastructures/DataStructuresProcessor.java | 64 +++-- .../CacheReadThroughAtomicRestartSelfTest.java | 32 + ...heReadThroughLocalAtomicRestartSelfTest.java | 32 + .../CacheReadThroughLocalRestartSelfTest.java | 32 + ...dThroughReplicatedAtomicRestartSelfTest.java | 32 + ...cheReadThroughReplicatedRestartSelfTest.java | 32 + .../cache/CacheReadThroughRestartSelfTest.java | 133 +++ .../cache/GridCacheAbstractSelfTest.java| 2 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- .../GridCacheSetAbstractSelfTest.java | 22 +-- .../IgniteDataStructureWithJobTest.java | 111 .../distributed/IgniteCacheManyClientsTest.java | 1 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 - ...achePartitionedMultiNodeFullApiSelfTest.java | 49 +-- .../IgniteCacheTxStoreSessionTest.java | 4 + .../IgniteCacheDataStructuresSelfTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 7 + 19 files changed, 493 insertions(+), 74 deletions(-) --
[1/7] incubator-ignite git commit: ignite-1022 do not need to start new thread inside tx on utility cache
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-965 bd65dcf07 -> 2880a9c58
ignite-1022 do not need to start new thread inside tx on utility cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74dc6d5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74dc6d5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74dc6d5a
Branch: refs/heads/ignite-965
Commit: 74dc6d5a23c7a40841cbb41357e1e3bb2404a93c
Parents: 1c66078
Author: sboikov
Authored: Tue Jun 23 10:54:37 2015 +0300
Committer: sboikov
Committed: Tue Jun 23 10:54:37 2015 +0300
--
.../datastructures/DataStructuresProcessor.java | 64 +++-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +-
.../GridCacheSetAbstractSelfTest.java | 8 +--
3 files changed, 27 insertions(+), 49 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74dc6d5a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 473a2ac..e6335b6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -297,8 +297,8 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
checkAtomicsConfiguration();
-removeDataStructure(new IgniteCallable() {
-@Override public Void call() throws Exception {
+removeDataStructure(new IgniteOutClosureX() {
+@Override public Void applyx() throws IgniteCheckedException {
dsCacheCtx.gate().enter();
try {
@@ -306,9 +306,6 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
removeInternal(key, GridCacheAtomicSequenceValue.class);
}
-catch (Exception e) {
-throw new IgniteCheckedException("Failed to remove
sequence by name: " + name, e);
-}
finally {
dsCacheCtx.gate().leave();
}
@@ -429,11 +426,7 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
if (err != null)
throw err;
-dataStructure = ctx.closure().callLocalSafe(new Callable() {
-@Override public T call() throws Exception {
-return c.applyx();
-}
-}, false).get();
+dataStructure = c.applyx();
tx.commit();
}
@@ -453,16 +446,13 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
awaitInitialization();
-removeDataStructure(new IgniteCallable() {
-@Override public Void call() throws Exception {
+removeDataStructure(new IgniteOutClosureX() {
+@Override public Void applyx() throws IgniteCheckedException {
dsCacheCtx.gate().enter();
try {
removeInternal(new GridCacheInternalKeyImpl(name),
GridCacheAtomicLongValue.class);
}
-catch (Exception e) {
-throw new IgniteCheckedException("Failed to remove atomic
long by name: " + name, e);
-}
finally {
dsCacheCtx.gate().leave();
}
@@ -479,7 +469,7 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
* @param afterRmv Optional closure to run after data structure removed.
* @throws IgniteCheckedException If failed.
*/
-private void removeDataStructure(IgniteCallable c,
+private void removeDataStructure(IgniteOutClosureX c,
String name,
DataStructureType type,
@Nullable IgniteInClosureX afterRmv)
@@ -515,7 +505,7 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
if (!exists)
return;
-rmvInfo = ctx.closure().callLocalSafe(c, false).get();
+rmvInfo = c.applyx();
tx.commit();
}
@@ -611,8 +601,8 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
awaitInitialization();
-removeDataStructure(new IgniteCallable() {
-@Override public Void call() throws Exception {
[3/7] incubator-ignite git commit: # ignite-1022 added test
# ignite-1022 added 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/78a9e69c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78a9e69c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78a9e69c
Branch: refs/heads/ignite-965
Commit: 78a9e69c5779f687407faddf565fa5090d94fee9
Parents: 627d0b5
Author: sboikov
Authored: Tue Jun 23 12:51:18 2015 +0300
Committer: sboikov
Committed: Tue Jun 23 12:51:18 2015 +0300
--
.../IgniteDataStructureWithJobTest.java | 111 +++
.../IgniteCacheDataStructuresSelfTestSuite.java | 1 +
2 files changed, 112 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78a9e69c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
new file mode 100644
index 000..47d96be
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.datastructures;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+/**
+ *
+ */
+public class IgniteDataStructureWithJobTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected long getTestTimeout() {
+return 2 * 60_000;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+super.afterTestsStopped();
+
+stopAllGrids();
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testJobWithRestart() throws Exception {
+Ignite ignite = startGrid(0);
+
+final AtomicBoolean stop = new AtomicBoolean();
+
+final long endTime = System.currentTimeMillis() + 60_000;
+
+IgniteInternalFuture fut = GridTestUtils.runAsync(new
Callable() {
+@Override public Object call() throws Exception {
+while (!Thread.currentThread().isInterrupted() && !stop.get()
&& U.currentTimeMillis() < endTime) {
+try (Ignite ignored = startGrid(1)) {
+Thread.sleep(500);
+}
+}
+
+return null;
+}
+});
+
+try {
+int iter = 0;
+
+while (System.currentTimeMillis() < endTime) {
+try {
+ignite.compute().broadcast(new IgniteClosure() {
+@Override public Integer apply(IgniteSet set) {
+assertNotNull(set);
+
+return 1;
+}
+}, ignite.set("set", new CollectionConfigu
[5/7] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1022' into ignite-sprint-7
Merge remote-tracking branch 'remotes/origin/ignite-1022' into ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b3e2bd48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b3e2bd48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b3e2bd48 Branch: refs/heads/ignite-965 Commit: b3e2bd488e183adf0146f170df94eb762c3056da Parents: 359b431 de7dcfe Author: sboikov Authored: Wed Jun 24 09:31:43 2015 +0300 Committer: sboikov Committed: Wed Jun 24 09:31:43 2015 +0300 -- .../datastructures/DataStructuresProcessor.java | 64 --- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- .../GridCacheSetAbstractSelfTest.java | 22 ++-- .../IgniteDataStructureWithJobTest.java | 111 +++ .../distributed/IgniteCacheManyClientsTest.java | 1 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 - ...achePartitionedMultiNodeFullApiSelfTest.java | 49 ++-- .../IgniteCacheDataStructuresSelfTestSuite.java | 1 + 8 files changed, 186 insertions(+), 71 deletions(-) --
[4/7] incubator-ignite git commit: # ignite-1022
# ignite-1022
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de7dcfe4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de7dcfe4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de7dcfe4
Branch: refs/heads/ignite-965
Commit: de7dcfe4e4a10e5b557bf7f6c1776026ed6a845e
Parents: 78a9e69
Author: sboikov
Authored: Wed Jun 24 09:29:56 2015 +0300
Committer: sboikov
Committed: Wed Jun 24 09:29:56 2015 +0300
--
.../datastructures/GridCacheSetAbstractSelfTest.java | 14 --
.../cache/distributed/IgniteCacheManyClientsTest.java | 1 +
2 files changed, 9 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de7dcfe4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 74114d9..0494bcc 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.testframework.*;
import java.util.*;
@@ -556,6 +555,9 @@ public abstract class GridCacheSetAbstractSelfTest extends
IgniteCollectionAbstr
* @throws Exception If failed.
*/
public void testNodeJoinsAndLeaves() throws Exception {
+if (collectionCacheMode() == LOCAL)
+return;
+
fail("https://issues.apache.org/jira/browse/IGNITE-584";);
testNodeJoinsAndLeaves(false);
@@ -565,6 +567,9 @@ public abstract class GridCacheSetAbstractSelfTest extends
IgniteCollectionAbstr
* @throws Exception If failed.
*/
public void testNodeJoinsAndLeavesCollocated() throws Exception {
+if (collectionCacheMode() == LOCAL)
+return;
+
fail("https://issues.apache.org/jira/browse/IGNITE-584";);
testNodeJoinsAndLeaves(true);
@@ -575,9 +580,6 @@ public abstract class GridCacheSetAbstractSelfTest extends
IgniteCollectionAbstr
* @throws Exception If failed.
*/
private void testNodeJoinsAndLeaves(boolean collocated) throws Exception {
-if (collectionCacheMode() == LOCAL)
-return;
-
CollectionConfiguration colCfg = config(collocated);
Set set0 = grid(0).set(SET_NAME, colCfg);
@@ -751,7 +753,7 @@ public abstract class GridCacheSetAbstractSelfTest extends
IgniteCollectionAbstr
IgniteInternalFuture fut;
try {
-fut = GridTestUtils.runMultiThreadedAsync(new
Callable() {
+fut = GridTestUtils.runMultiThreadedAsync(new Callable() {
@Override public Object call() throws Exception {
try {
while (!stop.get()) {
@@ -781,7 +783,7 @@ public abstract class GridCacheSetAbstractSelfTest extends
IgniteCollectionAbstr
for (int i = 0; i < gridCount(); i++) {
Iterator entries =
-
((IgniteKernal)grid(i)).context().cache().internalCache(cctx.name()).map().allEntries0().iterator();
+
(grid(i)).context().cache().internalCache(cctx.name()).map().allEntries0().iterator();
while (entries.hasNext()) {
GridCacheEntryEx entry = entries.next();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de7dcfe4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
index 48884de..1991f01 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
@@ -66,6 +66,7 @@ public class IgniteCacheManyClientsTest exte
[6/7] incubator-ignite git commit: #ignite-1043: Add tests for read through flag.
#ignite-1043: Add tests for read through flag.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf1ea21b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf1ea21b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf1ea21b
Branch: refs/heads/ignite-965
Commit: bf1ea21b2f2ff6964b8e13e821b5194243855ff4
Parents: b3e2bd4
Author: ivasilinets
Authored: Wed Jun 24 11:30:15 2015 +0300
Committer: ivasilinets
Committed: Wed Jun 24 11:30:15 2015 +0300
--
.../processors/cache/GridCacheContext.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../CacheReadThroughAtomicRestartSelfTest.java | 32 +
...heReadThroughLocalAtomicRestartSelfTest.java | 32 +
.../CacheReadThroughLocalRestartSelfTest.java | 32 +
...dThroughReplicatedAtomicRestartSelfTest.java | 32 +
...cheReadThroughReplicatedRestartSelfTest.java | 32 +
.../cache/CacheReadThroughRestartSelfTest.java | 133 +++
.../cache/GridCacheAbstractSelfTest.java| 2 +-
.../IgniteCacheTxStoreSessionTest.java | 4 +
.../testsuites/IgniteCacheTestSuite4.java | 7 +
11 files changed, 307 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf1ea21b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 8a4e3b9..9b7801c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -1377,7 +1377,7 @@ public class GridCacheContext implements
Externalizable {
}
/**
- * @return {@code True} if store read-through mode is enabled.
+ * @return {@code True} if {@link
CacheConfiguration#isLoadPreviousValue()} flag is set.
*/
public boolean loadPreviousValue() {
return cacheCfg.isLoadPreviousValue();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf1ea21b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index bdaa552..e160529 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -958,7 +958,7 @@ public final class GridDhtLockFuture extends
GridCompoundIdentityFuture
*
*/
private void loadMissingFromStore() {
-if (!skipStore && cctx.loadPreviousValue() && cctx.readThrough() &&
(needReturnVal || read)) {
+if (!skipStore && (read || cctx.loadPreviousValue()) &&
cctx.readThrough() && (needReturnVal || read)) {
final Map loadMap = new
LinkedHashMap<>();
final GridCacheVersion ver = version();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf1ea21b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
new file mode 100644
index 000..3ac7c3c
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheReadThroughAtomicRestartSelfTest.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licen
[3/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1045' into ignite-sprint-7
Merge remote-tracking branch 'remotes/origin/ignite-1045' into ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c270bd81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c270bd81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c270bd81 Branch: refs/heads/ignite-sprint-7 Commit: c270bd812df9cdf43d55ce0f546657e2f0e8d1da Parents: bf1ea21 a2141c6 Author: sboikov Authored: Wed Jun 24 12:17:57 2015 +0300 Committer: sboikov Committed: Wed Jun 24 12:17:57 2015 +0300 -- .../GridDhtPartitionsExchangeFuture.java| 46 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 466 +++ .../distributed/IgniteCache150ClientsTest.java | 189 ...teCacheClientNodePartitionsExchangeTest.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 1 + .../testsuites/IgniteClientTestSuite.java | 38 ++ 6 files changed, 733 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c270bd81/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java --
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-1045 [deleted] a2141c6a7
[2/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1045
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1045 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a2141c6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a2141c6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a2141c6a Branch: refs/heads/ignite-sprint-7 Commit: a2141c6a7012f10e8f8003160752047046ffdf0d Parents: a6cda33 359b431 Author: sboikov Authored: Tue Jun 23 22:14:51 2015 +0300 Committer: sboikov Committed: Tue Jun 23 22:14:51 2015 +0300 -- .../configuration/IgniteReflectionFactory.java | 81 ++- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 9 +- .../processors/hadoop/HadoopJobInfo.java| 4 +- .../hadoop/counter/HadoopCounterWriter.java | 5 +- .../testframework/junits/GridAbstractTest.java | 2 +- modules/hadoop/pom.xml | 78 -- .../fs/IgniteHadoopFileSystemCounterWriter.java | 9 +- .../processors/hadoop/HadoopClassLoader.java| 29 +++ .../processors/hadoop/HadoopDefaultJobInfo.java | 27 +-- .../internal/processors/hadoop/HadoopUtils.java | 237 -- .../hadoop/SecondaryFileSystemProvider.java | 3 +- .../hadoop/fs/HadoopFileSystemCacheUtils.java | 241 +++ .../hadoop/fs/HadoopFileSystemsUtils.java | 11 + .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 + .../hadoop/jobtracker/HadoopJobTracker.java | 25 +- .../child/HadoopChildProcessRunner.java | 3 +- .../processors/hadoop/v2/HadoopV2Job.java | 84 ++- .../hadoop/v2/HadoopV2JobResourceManager.java | 22 +- .../hadoop/v2/HadoopV2TaskContext.java | 37 ++- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 5 +- .../processors/hadoop/HadoopMapReduceTest.java | 2 +- .../processors/hadoop/HadoopTasksV1Test.java| 7 +- .../processors/hadoop/HadoopTasksV2Test.java| 7 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 3 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +- 28 files changed, 561 insertions(+), 389 deletions(-) --
[1/3] incubator-ignite git commit: ignite-1045 properly handle flag DynamicCacheChangeRequest.clientStartOnly
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-7 bf1ea21b2 -> c270bd812
ignite-1045 properly handle flag DynamicCacheChangeRequest.clientStartOnly
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a6cda33a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6cda33a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6cda33a
Branch: refs/heads/ignite-sprint-7
Commit: a6cda33a8b76925d09c21262e88467421025fa77
Parents: c7ba154
Author: sboikov
Authored: Tue Jun 23 16:47:13 2015 +0300
Committer: sboikov
Committed: Tue Jun 23 17:29:49 2015 +0300
--
.../GridDhtPartitionsExchangeFuture.java| 46 +-
...eDynamicCacheStartNoExchangeTimeoutTest.java | 466 +++
.../distributed/IgniteCache150ClientsTest.java | 189
...teCacheClientNodePartitionsExchangeTest.java | 1 +
.../testsuites/IgniteCacheTestSuite4.java | 1 +
.../testsuites/IgniteClientTestSuite.java | 38 ++
6 files changed, 733 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6cda33a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 7c780b0..38a0d55 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -153,6 +153,9 @@ public class GridDhtPartitionsExchangeFuture extends
GridFutureAdapter(CU.aliveRemoteServerNodesWithCaches(cctx,
exchId.topologyVersion()));
rmtIds = Collections.unmodifiableSet(new
HashSet<>(F.nodeIds(rmtNodes)));
-ready.set(true);
-
initFut.onDone(true);
if (log.isDebugEnabled())
log.debug("Initialized future: " + this);
-sendPartitions();
+if (cctx.localNode().equals(oldest)) {
+for (GridCacheContext cacheCtx :
cctx.cacheContexts()) {
+boolean updateTop = !cacheCtx.isLocal() &&
+
exchId.topologyVersion().equals(cacheCtx.startTopologyVersion());
+
+if (updateTop) {
+for (GridClientPartitionTopology top :
cctx.exchange().clientTopologies()) {
+if (top.cacheId() ==
cacheCtx.cacheId()) {
+cacheCtx.topology().update(exchId,
top.partitionMap(true));
+
+break;
+}
+}
+
+}
+}
+
+onDone(exchId.topologyVersion());
+}
+else
+sendPartitions();
}
-else
+else {
+rmtIds = Collections.emptyList();
+rmtNodes = Collections.emptyList();
+
onDone(exchId.topologyVersion());
+}
return;
}
@@ -885,7 +915,7 @@ public class GridDhtPartitionsExchangeFuture extends
GridFutureAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6cda33a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
new file mode 100644
index 000..5011e5f
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
@@ -0,0 +1,466 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor li
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10424 [created] bf1ea21b2
[4/4] incubator-ignite git commit: #ignite-965: processor throws ignite-checked exception.
#ignite-965: processor throws ignite-checked exception.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7f2393e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7f2393e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7f2393e
Branch: refs/heads/ignite-965
Commit: b7f2393e0d4bb4700b9d563295c85f2b122d4460
Parents: 64d1108
Author: ivasilinets
Authored: Wed Jun 24 13:06:32 2015 +0300
Committer: ivasilinets
Committed: Wed Jun 24 13:06:32 2015 +0300
--
.../IgniteScriptingCommandHandler.java | 119 ---
.../scripting/IgniteScriptProcessor.java| 15 ++-
2 files changed, 82 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7f2393e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
index 687f72a..839f412 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
@@ -50,19 +50,24 @@ public class IgniteScriptingCommandHandler extends
GridRestCommandHandlerAdapter
public IgniteScriptingCommandHandler(GridKernalContext ctx) {
super(ctx);
-IgniteScriptProcessor script = ctx.scripting();
+try {
+IgniteScriptProcessor script = ctx.scripting();
-String emitFunction = "function emit(result, f, args, nodeId)
{result.push([f.toString(), args, nodeId])}";
+String emitFunction = "function emit(result, f, args, nodeId)
{result.push([f.toString(), args, nodeId])}";
-String computeFunction = "function __compute(mapFuncSource, ids, args)
{" +
-" var res = [];" +
-" var f = __createJSFunction(mapFuncSource);" +
-" f(ids, args, emit.bind(null, res)); " +
-" return res;" +
-" }";
+String computeFunction = "function __compute(mapFuncSource, ids,
args) {" +
+" var res = [];" +
+" var f = __createJSFunction(mapFuncSource);" +
+" f(ids, args, emit.bind(null, res)); " +
+" return res;" +
+" }";
-script.addEngineFunction(emitFunction);
-script.addEngineFunction(computeFunction);
+script.addEngineFunction(emitFunction);
+script.addEngineFunction(computeFunction);
+}
+catch (IgniteCheckedException e) {
+ctx.log().error(e.getMessage());
+}
}
/** {@inheritDoc} */
@@ -82,16 +87,22 @@ public class IgniteScriptingCommandHandler extends
GridRestCommandHandlerAdapter
final RestRunScriptRequest req0 = (RestRunScriptRequest) req;
-Object callRes = ctx.grid().compute().call(new
IgniteCallable() {
+GridRestResponse res = ctx.grid().compute().call(new
IgniteCallable() {
@IgniteInstanceResource
private Ignite ignite;
-@Override public Object call() {
-return ((IgniteKernal)
ignite).context().scripting().invokeFunction(req0.script());
+@Override public GridRestResponse call() {
+try {
+return new GridRestResponse(((IgniteKernal)ignite).
+
context().scripting().invokeFunction(req0.script()));
+}
+catch (IgniteCheckedException e) {
+return new
GridRestResponse(GridRestResponse.STATUS_FAILED, e.getMessage());
+}
}
});
-return new GridFinishedFuture<>(new GridRestResponse(callRes));
+return new GridFinishedFuture<>(res);
}
case EXECUTE_MAP_REDUCE_SCRIPT: {
@@ -102,10 +113,10 @@ public class IgniteScriptingCommandHandler extends
GridRestCommandHandlerAdapter
final RestMapReduceScriptRequest req0 =
(RestMapReduceScriptRequest) req;
-Object execRes = ctx.grid().compute().execute(
+GridRestResponse execRes = ctx.grid().compute().execute(
[2/4] incubator-ignite git commit: #ignite-965: one IgniteScriptingCommandHandler.
#ignite-965: one IgniteScriptingCommandHandler.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39ab970f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39ab970f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39ab970f
Branch: refs/heads/ignite-965
Commit: 39ab970f55cfd56c1f4aa622a395b47544f8492a
Parents: f9f98ac
Author: ivasilinets
Authored: Wed Jun 24 12:35:59 2015 +0300
Committer: ivasilinets
Committed: Wed Jun 24 12:35:59 2015 +0300
--
.../processors/rest/GridRestProcessor.java | 5 +-
.../compute/IgniteComputeCommandHandler.java| 93
.../IgniteComputeTaskCommandHandler.java| 167 ---
.../IgniteScriptingCommandHandler.java | 212 +++
4 files changed, 214 insertions(+), 263 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39ab970f/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index 594e592..5d886fc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.*;
import org.apache.ignite.internal.processors.rest.client.message.*;
import org.apache.ignite.internal.processors.rest.handlers.*;
import org.apache.ignite.internal.processors.rest.handlers.cache.*;
-import org.apache.ignite.internal.processors.rest.handlers.compute.*;
+import org.apache.ignite.internal.processors.rest.handlers.scripting.*;
import org.apache.ignite.internal.processors.rest.handlers.datastructures.*;
import org.apache.ignite.internal.processors.rest.handlers.task.*;
import org.apache.ignite.internal.processors.rest.handlers.top.*;
@@ -289,8 +289,7 @@ public class GridRestProcessor extends GridProcessorAdapter
{
addHandler(new GridTopologyCommandHandler(ctx));
addHandler(new GridVersionCommandHandler(ctx));
addHandler(new DataStructuresCommandHandler(ctx));
-addHandler(new IgniteComputeCommandHandler(ctx));
-addHandler(new IgniteComputeTaskCommandHandler(ctx));
+addHandler(new IgniteScriptingCommandHandler(ctx));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39ab970f/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeCommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeCommandHandler.java
deleted file mode 100644
index 26246f5..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/compute/IgniteComputeCommandHandler.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.rest.handlers.compute;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.handlers.*;
-import org.apache.ignite.internal.processors.rest.request.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.rest.GridRestCommand.*;
-
-/**
- * Compute command h
[3/4] incubator-ignite git commit: #ignite-965: two commands EXECUTE_MAP_REDUCE_SCRIPT and RUN_SCRIPT.
#ignite-965: two commands EXECUTE_MAP_REDUCE_SCRIPT and RUN_SCRIPT.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/64d11083
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/64d11083
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/64d11083
Branch: refs/heads/ignite-965
Commit: 64d1108375db152c42d6208bb41e89855687c1df
Parents: 39ab970
Author: ivasilinets
Authored: Wed Jun 24 12:48:51 2015 +0300
Committer: ivasilinets
Committed: Wed Jun 24 12:48:51 2015 +0300
--
.../processors/rest/GridRestCommand.java| 11 ++-
.../IgniteScriptingCommandHandler.java | 40 ---
.../rest/request/RestComputeRequest.java| 74
.../rest/request/RestComputeTaskRequest.java| 74
.../request/RestMapReduceScriptRequest.java | 74
.../rest/request/RestRunScriptRequest.java | 40 +++
modules/nodejs/src/main/js/compute.js | 18 +
.../ignite/internal/NodeJsComputeSelfTest.java | 11 +--
modules/nodejs/src/test/js/test-compute.js | 30 ++--
.../http/jetty/GridJettyRestHandler.java| 13 ++--
10 files changed, 144 insertions(+), 241 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64d11083/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
index f964cb4..4ee672d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
@@ -96,14 +96,11 @@ public enum GridRestCommand {
/** Quit. */
QUIT("quit"),
-/** Affinity run. */
-AFFINITY_RUN("affscriptrun"),
+/** Run script. */
+RUN_SCRIPT("runscript"),
-/** Affinity call. */
-AFFINITY_CALL("affscriptcall"),
-
-/** Execute task. */
-EXECUTE_TASK("execscripttask");
+/** Execute map reduce script. */
+EXECUTE_MAP_REDUCE_SCRIPT("excmapreduce");
/** Enum values. */
private static final GridRestCommand[] VALS = values();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64d11083/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
index b402902..687f72a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
@@ -40,9 +40,9 @@ import static
org.apache.ignite.internal.processors.rest.GridRestCommand.*;
*/
public class IgniteScriptingCommandHandler extends
GridRestCommandHandlerAdapter {
/** Supported commands. */
-private static final Collection SUPPORTED_COMMANDS =
U.sealList(EXECUTE_TASK,
-AFFINITY_RUN,
-AFFINITY_CALL);
+private static final Collection SUPPORTED_COMMANDS =
U.sealList(
+EXECUTE_MAP_REDUCE_SCRIPT,
+RUN_SCRIPT);
/**
* @param ctx Context.
@@ -77,46 +77,30 @@ public class IgniteScriptingCommandHandler extends
GridRestCommandHandlerAdapter
assert SUPPORTED_COMMANDS.contains(req.command());
switch (req.command()) {
-case AFFINITY_RUN: {
-assert req instanceof RestComputeRequest : "Invalid type of
compute request.";
+case RUN_SCRIPT: {
+assert req instanceof RestRunScriptRequest : "Invalid type of
run script request.";
-final RestComputeRequest req0 = (RestComputeRequest) req;
+final RestRunScriptRequest req0 = (RestRunScriptRequest) req;
-ctx.grid().compute().affinityRun(req0.cacheName(), req0.key(),
new IgniteRunnable() {
-@IgniteInstanceResource
-private Ignite ignite;
-
-@Override public void run() {
-((IgniteKernal)
ignite).context().scripting().invokeFunction(req0.function());
-}
-});
-
-ret
[1/4] incubator-ignite git commit: #ignite-965: 4 spaces code style.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-965 2880a9c58 -> b7f2393e0
#ignite-965: 4 spaces code style.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9f98acb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9f98acb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9f98acb
Branch: refs/heads/ignite-965
Commit: f9f98acb4ae357b9f2a66ce3a0e47b6cf43d089c
Parents: 2880a9c
Author: ivasilinets
Authored: Wed Jun 24 12:25:49 2015 +0300
Committer: ivasilinets
Committed: Wed Jun 24 12:25:49 2015 +0300
--
modules/nodejs/src/main/js/apache-ignite.js | 10 +-
modules/nodejs/src/main/js/cache.js | 54 -
modules/nodejs/src/main/js/compute.js| 24 ++--
modules/nodejs/src/main/js/ignite.js | 8 +-
modules/nodejs/src/main/js/ignition.js | 87 +++
modules/nodejs/src/main/js/package.json | 24 ++--
modules/nodejs/src/main/js/server.js | 128 +++---
modules/nodejs/src/test/js/test-cache-api.js | 118 ++--
modules/nodejs/src/test/js/test-compute.js | 105 +-
modules/nodejs/src/test/js/test-ignition.js | 84 +++---
modules/nodejs/src/test/js/test-key.js | 22 ++--
modules/nodejs/src/test/js/test-utils.js | 114 +--
12 files changed, 389 insertions(+), 389 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9f98acb/modules/nodejs/src/main/js/apache-ignite.js
--
diff --git a/modules/nodejs/src/main/js/apache-ignite.js
b/modules/nodejs/src/main/js/apache-ignite.js
index 0df6160..e8252fc 100644
--- a/modules/nodejs/src/main/js/apache-ignite.js
+++ b/modules/nodejs/src/main/js/apache-ignite.js
@@ -16,9 +16,9 @@
*/
module.exports = {
- Cache : require('./cache.js').Cache,
- Ignition : require('./ignition.js').Ignition,
- Server : require('./server.js').Server,
- Ignite : require('./ignite.js').Ignite,
- Compute : require('./compute.js').Compute
+Cache : require('./cache.js').Cache,
+Ignition : require('./ignition.js').Ignition,
+Server : require('./server.js').Server,
+Ignite : require('./ignite.js').Ignite,
+Compute : require('./compute.js').Compute
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9f98acb/modules/nodejs/src/main/js/cache.js
--
diff --git a/modules/nodejs/src/main/js/cache.js
b/modules/nodejs/src/main/js/cache.js
index 78dd1d8..86eb22a 100644
--- a/modules/nodejs/src/main/js/cache.js
+++ b/modules/nodejs/src/main/js/cache.js
@@ -26,9 +26,9 @@ var Server = require("./server").Server;
* @param {string} cacheName Cache name
*/
function Cache(server, cacheName) {
- this._server = server;
- this._cacheName = cacheName;
- this._cacheNameParam = Server.pair("cacheName", this._cacheName);
+this._server = server;
+this._cacheName = cacheName;
+this._cacheNameParam = Server.pair("cacheName", this._cacheName);
}
/**
@@ -39,7 +39,7 @@ function Cache(server, cacheName) {
* @param {onGet} callback Called on finish
*/
Cache.prototype.get = function(key, callback) {
- this._server.runCommand("get", [this._cacheNameParam, Server.pair("key",
key)], callback);
+this._server.runCommand("get", [this._cacheNameParam, Server.pair("key",
key)], callback);
};
/**
@@ -51,8 +51,8 @@ Cache.prototype.get = function(key, callback) {
* @param {noValue} callback Called on finish
*/
Cache.prototype.put = function(key, value, callback) {
- this._server.runCommand("put", [this._cacheNameParam, Server.pair("key",
key), Server.pair("val", value)],
-callback);
+this._server.runCommand("put", [this._cacheNameParam, Server.pair("key",
key), Server.pair("val", value)],
+callback);
}
/**
@@ -63,7 +63,7 @@ Cache.prototype.put = function(key, value, callback) {
* @param {noValue} callback Called on finish
*/
Cache.prototype.remove = function(key, callback) {
- this._server.runCommand("rmv", [this._cacheNameParam, Server.pair("key",
key)], callback);
+this._server.runCommand("rmv", [this._cacheNameParam, Server.pair("key",
key)], callback);
}
/**
@@ -74,11 +74,11 @@ Cache.prototype.remove = function(key, callback) {
* @param {noValue} callback Called on finish
*/
Cache.prototype.removeAll = function(keys, callback) {
- var params = [this._cacheNameParam];
+var params = [this._cacheNameParam];
- params = params.concat(Cache.concatParams("k", keys));
+params = params.concat(Cache.concatParams("k", keys));
- this._server.runCommand("rmvall", params, callback);
+this._serve
incubator-ignite git commit: #ignite-965: add checking for exception in map function.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-965 b7f2393e0 -> cb0407ddb
#ignite-965: add checking for exception in map function.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb0407dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb0407dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb0407dd
Branch: refs/heads/ignite-965
Commit: cb0407ddb01593c9299f5a6cb1949a63a090b206
Parents: b7f2393
Author: ivasilinets
Authored: Wed Jun 24 13:08:40 2015 +0300
Committer: ivasilinets
Committed: Wed Jun 24 13:08:40 2015 +0300
--
.../handlers/scripting/IgniteScriptingCommandHandler.java| 8 +++-
.../internal/processors/scripting/IgniteScriptProcessor.java | 6 +++---
2 files changed, 10 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb0407dd/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
index 839f412..ff56d88 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
@@ -210,8 +210,14 @@ public class IgniteScriptingCommandHandler extends
GridRestCommandHandlerAdapter
try {
String[] data = new String[results.size()];
-for (int i = 0; i < results.size(); ++i)
+for (int i = 0; i < results.size(); ++i) {
+IgniteException err = results.get(i).getException();
+
+if (err != null)
+return new
GridRestResponse(GridRestResponse.STATUS_FAILED, err.getMessage());
+
data[i] = results.get(i).getData().toString();
+}
return new
GridRestResponse(ctx.scripting().invokeFunction(reduceFunc, (Object)data));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb0407dd/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
index b6f29ed..9843bc3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
@@ -84,15 +84,15 @@ public class IgniteScriptProcessor extends
GridProcessorAdapter {
}
/**
- * @param source Script source.
+ * @param src Script src.
* @param args Arguments.
* @return Result of the function.
* @throws IgniteCheckedException If script failed.
*/
-public Object invokeFunction(String source, Object... args) throws
IgniteCheckedException {
+public Object invokeFunction(String src, Object... args) throws
IgniteCheckedException {
Object[] newArgs = new Object[args.length + 1];
-newArgs[0] = source;
+newArgs[0] = src;
System.arraycopy(args, 0, newArgs, 1, args.length);
incubator-ignite git commit: #ignite-yardstick-client change benchmark.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-yardstick-client 8f6db6149 -> 987549b68
#ignite-yardstick-client change benchmark.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/987549b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/987549b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/987549b6
Branch: refs/heads/ignite-yardstick-client
Commit: 987549b68a38794217a8ab7286f2d5d4ddf19962
Parents: 8f6db61
Author: nikolay_tikhonov
Authored: Wed Jun 24 13:13:51 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed Jun 24 13:13:51 2015 +0300
--
.../yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/987549b6/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
index e33b7b7..d80843a 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
@@ -73,6 +73,6 @@ public class IgnitePutGetClientPerThreadBenchmark extends
IgniteCacheAbstractBen
/** {@inheritDoc} */
@Override protected IgniteCache cache() {
-return ignite().cache("atomic");
+return null;//ignite().cache("atomic");
}
}
incubator-ignite git commit: # ignite-648: add new test classes
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-648 f1e270e4b -> 325789592
# ignite-648: add new test classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/32578959
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/32578959
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/32578959
Branch: refs/heads/ignite-648
Commit: 325789592cec721dde5576f3e695591de7b6f2bd
Parents: f1e270e
Author: ashutak
Authored: Wed Jun 24 13:14:58 2015 +0300
Committer: ashutak
Committed: Wed Jun 24 13:14:58 2015 +0300
--
...micOffHeapTieredMultiJvmFullApiSelfTest.java | 31 ++
...derOffHeapTieredMultiJvmFullApiSelfTest.java | 31 ++
...micOffHeapTieredMultiJvmFullApiSelfTest.java | 31 ++
...ledOffHeapTieredMultiJvmFullApiSelfTest.java | 31 ++
...nedOffHeapTieredMultiJvmFullApiSelfTest.java | 31 ++
...tedOffHeapTieredMultiJvmFullApiSelfTest.java | 31 ++
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 100 ++
.../testsuites/IgniteMultiJvmTestSuite.java | 101 ---
8 files changed, 286 insertions(+), 101 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32578959/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java
new file mode 100644
index 000..7b2aad1
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.multijvm;
+
+import org.apache.ignite.internal.processors.cache.distributed.near.*;
+
+/**
+ * Multy Jvm tests.
+ */
+public class GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest
+extends GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest {
+/** {@inheritDoc} */
+protected boolean isMultiJvm() {
+return true;
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32578959/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
new file mode 100644
index 000..ed43c15
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language govern
Git Push Summary
Repository: incubator-ignite Updated Tags: refs/tags/1.0.0-RELEASE-TEST-RC1 [created] 9ca98d299 refs/tags/1.0.0-RELEASE-TEST-RC2 [created] 16ba1421d refs/tags/1.0.0-RELEASE-TEST-RC3 [created] 1b3c8184d refs/tags/1.0.0-RELEASE-TEST-RC4 [created] d9ab06450 refs/tags/1.0.0-RELEASETESTRC1 [created] 3fa593f7a refs/tags/1.0.1-RC1-RELEASETEST [created] 90b39a7c3 refs/tags/1.0.1-RC1TESTRELEASE [created] 593ce4bfe refs/tags/1.0.1-RELEASE-TEST-RC5 [created] eee94fa28 refs/tags/1.0.1-RELEASE-TEST-RC6 [created] 4de9e8dc5 refs/tags/1.1.0 [created] ed6aaa88d refs/tags/1.1.4 [created] 821f6a364
[1/2] incubator-ignite git commit: ignite-950: performance improvements
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-950 f632f1d95 -> 6bf4fa755
ignite-950: performance improvements
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f97c471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f97c471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f97c471
Branch: refs/heads/ignite-950
Commit: 0f97c4714d912013641255c088494646dc79dfd8
Parents: f632f1d
Author: Denis Magda
Authored: Wed Jun 24 13:11:26 2015 +0300
Committer: Denis Magda
Committed: Wed Jun 24 13:11:26 2015 +0300
--
.../optimized/OptimizedObjectInputStream.java | 84 ++--
.../OptimizedObjectInputStreamExt.java | 15 ++--
.../optimized/OptimizedObjectOutputStream.java | 64 +++
.../OptimizedObjectOutputStreamExt.java | 59 +-
4 files changed, 155 insertions(+), 67 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f97c471/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
index 2caf0cd..57f1a53 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
@@ -72,6 +72,9 @@ public class OptimizedObjectInputStream extends
ObjectInputStream implements Opt
private Class curCls;
/** */
+private boolean curHasFooter;
+
+/** */
private final HandleTable handles = new HandleTable(10);
/** */
@@ -154,6 +157,7 @@ public class OptimizedObjectInputStream extends
ObjectInputStream implements Opt
curObj = null;
curFields = null;
+curHasFooter = false;
marshalAwareValues = null;
}
@@ -161,6 +165,7 @@ public class OptimizedObjectInputStream extends
ObjectInputStream implements Opt
@Override public Object readObjectOverride() throws
ClassNotFoundException, IOException {
curObj = null;
curFields = null;
+curHasFooter = false;
byte ref = in.readByte();
@@ -372,18 +377,22 @@ public class OptimizedObjectInputStream extends
ObjectInputStream implements Opt
*
* @param obj Object.
* @param fieldOffs Field offsets.
+ * @param hasFooter Whether footer is included in the marshalled form.
* @throws ClassNotFoundException If class not found.
* @throws IOException In case of error.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
-void readFields(Object obj, OptimizedClassDescriptor.ClassFields
fieldOffs) throws ClassNotFoundException,
+void readFields(Object obj, OptimizedClassDescriptor.ClassFields
fieldOffs, boolean hasFooter)
+throws ClassNotFoundException,
IOException {
+
for (int i = 0; i < fieldOffs.size(); i++) {
OptimizedClassDescriptor.FieldInfo t = fieldOffs.get(i);
switch ((t.type())) {
case BYTE:
-readFieldType();
+if (hasFooter)
+readFieldType();
byte resByte = readByte();
@@ -393,7 +402,8 @@ public class OptimizedObjectInputStream extends
ObjectInputStream implements Opt
break;
case SHORT:
-readFieldType();
+if (hasFooter)
+readFieldType();
short resShort = readShort();
@@ -403,7 +413,8 @@ public class OptimizedObjectInputStream extends
ObjectInputStream implements Opt
break;
case INT:
-readFieldType();
+if (hasFooter)
+readFieldType();
int resInt = readInt();
@@ -413,7 +424,8 @@ public class OptimizedObjectInputStream extends
ObjectInputStream implements Opt
break;
case LONG:
-readFieldType();
+if (hasFooter)
+readFieldType();
long resLong = readLong();
@@ -423,7 +435,8 @@ public class OptimizedObjectInputStream extends
ObjectInputStream implements Opt
break;
case FLOAT:
-readFieldType();
+if (hasFooter)
+readFieldType();
float resFloat
[2/2] incubator-ignite git commit: ignite-950: performance improvements
ignite-950: performance improvements
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6bf4fa75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6bf4fa75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6bf4fa75
Branch: refs/heads/ignite-950
Commit: 6bf4fa7559ece0c55096932aa2c39f8f0cbd2e45
Parents: 0f97c47
Author: Denis Magda
Authored: Wed Jun 24 13:15:58 2015 +0300
Committer: Denis Magda
Committed: Wed Jun 24 13:15:58 2015 +0300
--
.../marshaller/optimized/OptimizedObjectOutputStreamExt.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bf4fa75/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStreamExt.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStreamExt.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStreamExt.java
index 2ded7c9..9833e98 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStreamExt.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStreamExt.java
@@ -115,9 +115,7 @@ public class OptimizedObjectOutputStreamExt extends
OptimizedObjectOutputStream
writeShort(footerLen);
if (hasHandles) {
-for (int i = 0; i < data.size(); i++) {
-Meta fieldMeta = data.get(i);
-
+for (Meta fieldMeta : data) {
GridHandleTable.ObjectInfo objInfo =
handles.get(fieldMeta.fieldId);
if (objInfo == null)
[03/50] incubator-ignite git commit: Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6
Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de531896 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de531896 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de531896 Branch: refs/heads/master Commit: de53189605c859a6eb9aa09c8181d5720c5dc28b Parents: 4cc376b eebf9c1 Author: S.Vladykin Authored: Thu Jun 18 09:51:50 2015 +0300 Committer: S.Vladykin Committed: Thu Jun 18 09:51:50 2015 +0300 -- .../affinity/AffinityTopologyVersion.java | 7 - .../distributed/dht/GridDhtLocalPartition.java | 56 +- .../dht/GridDhtPartitionsReservation.java | 292 + .../cache/distributed/dht/GridReservable.java | 35 + .../dht/preloader/GridDhtPartitionMap.java | 26 +- .../cache/query/GridCacheQueryManager.java | 33 - .../cache/query/GridCacheTwoStepQuery.java | 22 +- .../processors/query/GridQueryIndexing.java | 14 +- .../processors/query/GridQueryProcessor.java| 14 +- .../messages/GridQueryNextPageResponse.java | 34 +- .../h2/twostep/messages/GridQueryRequest.java | 111 +++- .../apache/ignite/internal/util/GridDebug.java | 19 + .../processors/query/h2/IgniteH2Indexing.java | 79 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 49 +- .../query/h2/twostep/GridMapQueryExecutor.java | 332 +++--- .../query/h2/twostep/GridMergeIndex.java| 17 +- .../h2/twostep/GridMergeIndexUnsorted.java | 7 +- .../h2/twostep/GridReduceQueryExecutor.java | 650 --- .../query/h2/twostep/GridResultPage.java| 21 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 3 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 - ...lientQueryReplicatedNodeRestartSelfTest.java | 419 .../IgniteCacheQueryNodeRestartSelfTest.java| 36 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 383 +++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 25 files changed, 2380 insertions(+), 282 deletions(-) --
[15/50] incubator-ignite git commit: # changed discovery error message
# changed discovery error message
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/31cf8027
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/31cf8027
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/31cf8027
Branch: refs/heads/master
Commit: 31cf8027216afca3d02461caa4f4245bdd8d0e73
Parents: cb862b6
Author: Yakov Zhdanov
Authored: Thu Jun 18 14:56:12 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Jun 18 14:56:12 2015 +0300
--
.../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/31cf8027/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 63f165d..e9a949a 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -4103,8 +4103,14 @@ class ServerImpl extends TcpDiscoveryImpl {
if (U.isMacInvalidArgumentError(e))
LT.error(log, e, "Failed to initialize connection
[sock=" + sock + "]\n\t" +
U.MAC_INVALID_ARG_MSG);
-else
-LT.error(log, e, "Failed to initialize connection
[sock=" + sock + ']');
+else {
+U.error(
+log,
+"Failed to initialize connection (this can
happen due to short time " +
+"network problems and can be ignored if
does not affect node discovery) " +
+"[sock=" + sock + ']',
+e);
+}
}
onException("Caught exception on handshake [err=" + e + ",
sock=" + sock + ']', e);
[39/50] incubator-ignite git commit: #ignite-973 - fix for IGNITE-1041
#ignite-973 - fix for IGNITE-1041
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ced62b87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ced62b87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ced62b87
Branch: refs/heads/master
Commit: ced62b8708952abfabc4926cfbb28c424d1ce651
Parents: de27ff1
Author: S.Vladykin
Authored: Mon Jun 22 09:35:43 2015 +0300
Committer: S.Vladykin
Committed: Mon Jun 22 09:35:43 2015 +0300
--
.../processors/query/h2/IgniteH2Indexing.java | 2 ++
.../query/h2/twostep/GridMapQueryExecutor.java | 23 ++--
2 files changed, 13 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ced62b87/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index c162ae6..06c0961 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1354,6 +1354,8 @@ public class IgniteH2Indexing implements
GridQueryIndexing {
Schema rmv = schemas.remove(schema);
if (rmv != null) {
+mapQryExec.onCacheStop(ccfg.getName());
+
try {
dropSchema(schema);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ced62b87/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index ba95d43..0f38353 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -124,18 +124,6 @@ public class GridMapQueryExecutor {
}
}, EventType.EVT_NODE_FAILED, EventType.EVT_NODE_LEFT);
-// Drop group reservations for dead caches.
-ctx.event().addLocalEventListener(new GridLocalEventListener() {
-@Override public void onEvent(Event evt) {
-String cacheName = ((CacheEvent)evt).cacheName();
-
-for (T2 grpKey :
reservations.keySet()) {
-if (F.eq(grpKey.get1(), cacheName))
-reservations.remove(grpKey);
-}
-}
-}, EventType.EVT_CACHE_STOPPED);
-
ctx.io().addMessageListener(GridTopic.TOPIC_QUERY, new
GridMessageListener() {
@Override public void onMessage(UUID nodeId, Object msg) {
if (!busyLock.enterBusy())
@@ -599,6 +587,17 @@ public class GridMapQueryExecutor {
}
/**
+ * @param cacheName Cache name.
+ */
+public void onCacheStop(String cacheName) {
+// Drop group reservations.
+for (T2 grpKey :
reservations.keySet()) {
+if (F.eq(grpKey.get1(), cacheName))
+reservations.remove(grpKey);
+}
+}
+
+/**
*
*/
private class QueryResults {
[32/50] incubator-ignite git commit: #IGNITE-1034 - Corrected messages after code review.
#IGNITE-1034 - Corrected messages after code 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/e1b88003
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1b88003
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1b88003
Branch: refs/heads/master
Commit: e1b880030aae7ef9cfa6a812d17a97cf8055dfd5
Parents: 7a8b572
Author: Alexey Goncharuk
Authored: Fri Jun 19 10:57:04 2015 -0700
Committer: Alexey Goncharuk
Committed: Fri Jun 19 10:57:04 2015 -0700
--
.../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1b88003/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 a540b7c..3997768 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
@@ -1158,6 +1158,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
*
* When set to a positive number, communication SPI will monitor clients
outbound queue sizes and will drop
* those clients whose queue exceeded this limit.
+ *
+ * Usually this value should be set to the same value as {@link
#getMessageQueueLimit()} which controls
+ * message back-pressure for server nodes. The default value for this
parameter is {@link #DFLT_MSG_QUEUE_LIMIT}.
*
* @param slowClientQueueLimit Slow cilent queue limit.
*/
@@ -1913,8 +1916,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
ClusterNode node = getSpiContext().node(id);
if (node != null && node.isClient()) {
-String msg = "Client node outbound queue size exceed
configured slow client queue limit, " +
-"will fail the node (consider changing
\'slowClientQueueLimit\') [clientNode=" + node +
+String msg = "Client node outbound queue size exceeded
slowClientQueueLimit, " +
+"the client will be dropped (consider changing
\'slowClientQueueLimit\') [clientNode=" + node +
", slowClientQueueLimit=" + slowClientQueueLimit + ']';
LT.warn(log, null, msg);
[13/50] incubator-ignite git commit: # changed defaults for discovery
# changed defaults for discovery
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5011c2b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5011c2b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5011c2b5
Branch: refs/heads/master
Commit: 5011c2b5e9671ced95e21f122c2e5ef9102c19fe
Parents: b23ea74
Author: Yakov Zhdanov
Authored: Thu Jun 18 14:50:43 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Jun 18 14:50:43 2015 +0300
--
.../communication/tcp/TcpCommunicationSpi.java | 6 ++--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +---
2 files changed, 24 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5011c2b5/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 9e38788..fc504f4 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
@@ -174,8 +174,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** Default socket send and receive buffer size. */
public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
-/** Default connection timeout (value is 1000ms). */
-public static final long DFLT_CONN_TIMEOUT = 1000;
+/** Default connection timeout (value is 5000ms). */
+public static final long DFLT_CONN_TIMEOUT = 5000;
/** Default Maximum connection timeout (value is 600,000ms). */
public static final long DFLT_MAX_CONN_TIMEOUT = 10 * 60 * 1000;
@@ -680,7 +680,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** Recovery and idle clients handler. */
private CommunicationWorker commWorker;
-
+
/** Shared memory accept worker. */
private ShmemAcceptWorker shmemAcceptWorker;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5011c2b5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index e4ef744..9a26867 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -21,7 +21,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.io.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -66,6 +65,17 @@ import java.util.concurrent.atomic.*;
* and then this info goes to coordinator. When coordinator processes join
request
* and issues node added messages and all other nodes then receive info about
new node.
* Configuration
+ * Important Notice
+ * Configuration defaults are chosen to make possible for discovery SPI to
reliably work on
+ * most of hardware and virtual deployments, but this has made failure
detection time worse.
+ *
+ * For stable low-latency networks the following more aggressive settings are
recommended
+ * (which allows failure detection time ~200ms):
+ *
+ * Heartbeat frequency (see {@link #setHeartbeatFrequency(long)}) -
100ms
+ * Socket timeout (see {@link #setSocketTimeout(long)}) - 200ms
+ * Message acknowledgement timeout (see {@link #setAckTimeout(long)}) -
50ms
+ *
* Mandatory
* There are no mandatory configuration parameters.
* Optional
@@ -164,23 +174,23 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
/** Default value for thread priority (value is 10). */
public static final int DFLT_THREAD_PRI = 10;
-/** Default heartbeat messages issuing frequency (value is
100ms). */
-public static final long DFLT_HEARTBEAT_FREQ = 100;
+/** Default heartbeat messages issuing frequency (value is
2000ms). */
+public static final long DFLT_HEARTBEAT_FREQ = 2000;
/** Default size of topology snapshots history. */
public static final int DFLT_TOP_HISTORY_SIZE = 1000;
-/** Default socket operations timeout in milliseconds (value is
200ms). */
-public static f
[40/50] incubator-ignite git commit: #ignite-973 - minor
#ignite-973 - minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/774bc94f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/774bc94f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/774bc94f
Branch: refs/heads/master
Commit: 774bc94ff7491735cf966f6f7a9b2a1887071dcf
Parents: ced62b8
Author: S.Vladykin
Authored: Mon Jun 22 09:46:08 2015 +0300
Committer: S.Vladykin
Committed: Mon Jun 22 09:46:08 2015 +0300
--
.../processors/cache/IgniteCacheOffheapEvictQueryTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/774bc94f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
index fc6c125..72bfcaa 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
@@ -69,7 +69,7 @@ public class IgniteCacheOffheapEvictQueryTest extends
GridCommonAbstractTest {
*/
public void testEvictAndRemove() throws Exception {
final int KEYS_CNT = 3000;
-final int THREADS_CNT = 256;
+final int THREADS_CNT = 50;
final IgniteCache c = startGrid().cache(null);
[16/50] incubator-ignite git commit: # disco spi usability - doc and warning messages on failure detection speed up
# disco spi usability - doc and warning messages on failure detection speed up
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc81bcfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc81bcfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc81bcfd
Branch: refs/heads/master
Commit: fc81bcfd0a4fd20e4322a060d7745754f14767e1
Parents: 31cf802
Author: Yakov Zhdanov
Authored: Thu Jun 18 15:08:33 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Jun 18 15:08:33 2015 +0300
--
.../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 ---
2 files changed, 8 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc81bcfd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index e9a949a..f7b6de9 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -2320,6 +2320,10 @@ class ServerImpl extends TcpDiscoveryImpl {
for (TcpDiscoveryNode n : failedNodes)
msgWorker.addMessage(new
TcpDiscoveryNodeFailedMessage(locNodeId, n.id(), n.internalOrder()));
+
+LT.warn(log, null, "Local node has detected failed nodes and
started cluster-wide procedure. " +
+"To speed up failure detection please see 'Failure
Detection' section under javadoc" +
+"for 'TcpDiscoverySpi'");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc81bcfd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 9a26867..d7c33a5 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -64,9 +64,9 @@ import java.util.concurrent.atomic.*;
* {@link TcpDiscoveryIpFinder} about self start (stops when send succeeds)
* and then this info goes to coordinator. When coordinator processes join
request
* and issues node added messages and all other nodes then receive info about
new node.
- * Configuration
- * Important Notice
- * Configuration defaults are chosen to make possible for discovery SPI to
reliably work on
+ * Failure Detection
+ * Configuration defaults (see Configuration section below for details)
+ * are chosen to make possible for discovery SPI work reliably on
* most of hardware and virtual deployments, but this has made failure
detection time worse.
*
* For stable low-latency networks the following more aggressive settings are
recommended
@@ -76,6 +76,7 @@ import java.util.concurrent.atomic.*;
* Socket timeout (see {@link #setSocketTimeout(long)}) - 200ms
* Message acknowledgement timeout (see {@link #setAckTimeout(long)}) -
50ms
*
+ * Configuration
* Mandatory
* There are no mandatory configuration parameters.
* Optional
[08/50] incubator-ignite git commit: sprint-6 - ignite-indexing module check
sprint-6 - ignite-indexing module check
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1eee186
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1eee186
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1eee186
Branch: refs/heads/master
Commit: c1eee18615be56c7bb60d34614451612710b6cef
Parents: d874b00
Author: S.Vladykin
Authored: Thu Jun 18 13:39:19 2015 +0300
Committer: S.Vladykin
Committed: Thu Jun 18 13:39:19 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java| 5 +
.../ignite/internal/processors/query/GridQueryProcessor.java | 7 +++
2 files changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1eee186/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 0d70792..48fd259 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -556,6 +556,11 @@ public class IgniteCacheProxy extends
AsyncSupportAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1eee186/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 4f2486b..e080c6d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -107,6 +107,13 @@ public class GridQueryProcessor extends
GridProcessorAdapter {
}
/**
+ * @return {@code true} If indexing module is in classpath and
successfully initialized.
+ */
+public boolean moduleEnabled() {
+return idx != null;
+}
+
+/**
* @param ccfg Cache configuration.
* @throws IgniteCheckedException If failed.
*/
[09/50] incubator-ignite git commit: # minor
# minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08d134dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08d134dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08d134dd
Branch: refs/heads/master
Commit: 08d134dd43f143ee8d01f6394de27426c64a96ea
Parents: d874b00
Author: Yakov Zhdanov
Authored: Thu Jun 18 13:46:52 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Jun 18 13:46:52 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheUtils.java| 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08d134dd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 3bd2a45..8c26046 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -391,6 +391,15 @@ public class GridCacheUtils {
}
/**
+ * Gets public cache name substituting null name by {@code 'default'}.
+ *
+ * @return Public cache name substituting null name by {@code 'default'}.
+ */
+public static String namexx(@Nullable String name) {
+return name == null ? "default" : name;
+}
+
+/**
* @return Partition to state transformer.
*/
@SuppressWarnings({"unchecked"})
[22/50] incubator-ignite git commit: # ignite-1034 fixed assert in discovery manager, warning on all nodes, improved test
# ignite-1034 fixed assert in discovery manager, warning on all nodes, improved
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/49dc4a50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49dc4a50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49dc4a50
Branch: refs/heads/master
Commit: 49dc4a50197b8a7203bfc0684d5f77f46bda0297
Parents: 44bbece
Author: sboikov
Authored: Fri Jun 19 10:12:20 2015 +0300
Committer: sboikov
Committed: Fri Jun 19 11:41:00 2015 +0300
--
.../internal/managers/GridManagerAdapter.java | 8 +--
.../discovery/GridDiscoveryManager.java | 19 --
.../continuous/CacheContinuousQueryHandler.java | 8 +++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 20 +++---
.../tcp/TcpCommunicationSpiMBean.java | 11
.../ignite/spi/discovery/DiscoverySpi.java | 3 +-
.../ignite/spi/discovery/tcp/ClientImpl.java| 12 +++-
.../ignite/spi/discovery/tcp/ServerImpl.java| 12 +++-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 6 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 18 +
...ridFailFastNodeFailureDetectionSelfTest.java | 17 -
.../IgniteSlowClientDetectionSelfTest.java | 69 +++-
.../testframework/GridSpiTestContext.java | 4 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 +
17 files changed, 180 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/49dc4a50/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 885d52c..40a5ea5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -480,12 +480,12 @@ public abstract class GridManagerAdapter implements GridMan
return ctx.io().messageFactory();
}
-@Override public boolean tryFailNode(UUID nodeId) {
-return ctx.discovery().tryFailNode(nodeId);
+@Override public boolean tryFailNode(UUID nodeId,
@Nullable String warning) {
+return ctx.discovery().tryFailNode(nodeId, warning);
}
-@Override public void failNode(UUID nodeId) {
-ctx.discovery().failNode(nodeId);
+@Override public void failNode(UUID nodeId, @Nullable
String warning) {
+ctx.discovery().failNode(nodeId, warning);
}
@Override public void
addTimeoutObject(IgniteSpiTimeoutObject obj) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/49dc4a50/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 717cdf3..1e4b972 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -386,9 +386,13 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
verChanged = false;
}
else {
-minorTopVer = 0;
+if (type != EVT_NODE_SEGMENTED) {
+minorTopVer = 0;
-verChanged = true;
+verChanged = true;
+}
+else
+verChanged = false;
}
AffinityTopologyVersion nextTopVer = new
AffinityTopologyVersion(topVer, minorTopVer);
@@ -1481,15 +1485,16 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/**
* @param nodeId Node ID.
+ * @param warning Warning message to be shown on all nodes.
* @return Whether node is failed.
*/
-public boolean tryFailNode(UUID nodeId) {
+public boolean tryFailNode(
[05/50] incubator-ignite git commit: #Fixed aws tests. (Changed bucket name)
#Fixed aws tests. (Changed bucket name)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45939ace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45939ace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45939ace
Branch: refs/heads/master
Commit: 45939ace51cd081ac1c755ca0b6076a22f00cfb5
Parents: de53189
Author: nikolay_tikhonov
Authored: Thu Jun 18 10:30:33 2015 +0300
Committer: nikolay_tikhonov
Committed: Thu Jun 18 10:31:31 2015 +0300
--
.../ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java| 2 +-
.../apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 ++--
.../spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java | 2 +-
.../ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java| 2 +-
.../tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45939ace/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
index a354e67..b01ba81 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
@@ -39,7 +39,7 @@ public class S3CheckpointManagerSelfTest extends
GridCheckpointManagerAbstractSe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test-bucket");
+spi.setBucketNameSuffix("unit-test-bucket");
cfg.setCheckpointSpi(spi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45939ace/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
index 5cf0f2e..5894678 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
@@ -48,7 +48,7 @@ public class S3CheckpointSpiSelfTest extends
GridSpiAbstractTesthttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45939ace/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
index 7de2124..34f25ad 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java
@@ -34,7 +34,7 @@ public class S3CheckpointSpiStartStopSelfTest extends
GridSpiStartStopAbstractTe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test-bucket");
+spi.setBucketNameSuffix("unit-test-bucket");
super.spiConfigure(spi);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45939ace/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
index 56f39de..c683cb3 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
@@ -39,7 +39,7 @@ public class S3SessionCheckpointSelfTest extends
GridSessionCheckpointAbstractSe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test-bucket");
+spi.setBucketNameSuffix("unit-test-bucket");
cfg.setCheckpointSpi(spi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45939ace/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java
-
[20/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad0a026f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad0a026f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad0a026f Branch: refs/heads/master Commit: ad0a026f480ff67025b39737c2e068b20035feb6 Parents: fc81bcf 8c404f7 Author: Yakov Zhdanov Authored: Thu Jun 18 15:54:59 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jun 18 15:54:59 2015 +0300 -- .../communication/tcp/TcpCommunicationSpi.java | 38 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java| 21 +++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 - .../tcp/internal/TcpDiscoveryNode.java | 18 ++ .../apache/ignite/internal/GridSelfTest.java| 20 ++- 5 files changed, 72 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad0a026f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad0a026f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java --
[04/50] incubator-ignite git commit: # ignite-sprint-6 fixed test to work in offheap mode
# ignite-sprint-6 fixed test to work in offheap mode
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cc20ef6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cc20ef6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cc20ef6a
Branch: refs/heads/master
Commit: cc20ef6adce9bdeea19d37f5817c0693e380cfa5
Parents: de53189
Author: sboikov
Authored: Thu Jun 18 10:30:20 2015 +0300
Committer: sboikov
Committed: Thu Jun 18 10:30:20 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 24 +++-
1 file changed, 13 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc20ef6a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 128d452..151c249 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -1020,25 +1020,27 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
throws Exception {
IgniteCache cache = jcache();
+final String key = primaryKeysForCache(cache, 1).get(0);
+
Transaction tx = txEnabled() ?
ignite(0).transactions().txStart(concurrency, READ_COMMITTED) : null;
try {
if (startVal)
-cache.put("key", 2);
+cache.put(key, 2);
else
-assertEquals(null, cache.get("key"));
+assertEquals(null, cache.get(key));
-Integer expectedRes = startVal ? 2 : null;
+Integer expRes = startVal ? 2 : null;
-assertEquals(String.valueOf(expectedRes), cache.invoke("key",
INCR_PROCESSOR));
+assertEquals(String.valueOf(expRes), cache.invoke(key,
INCR_PROCESSOR));
-expectedRes = startVal ? 3 : 1;
+expRes = startVal ? 3 : 1;
-assertEquals(String.valueOf(expectedRes), cache.invoke("key",
INCR_PROCESSOR));
+assertEquals(String.valueOf(expRes), cache.invoke(key,
INCR_PROCESSOR));
-expectedRes++;
+expRes++;
-assertEquals(String.valueOf(expectedRes), cache.invoke("key",
INCR_PROCESSOR));
+assertEquals(String.valueOf(expRes), cache.invoke(key,
INCR_PROCESSOR));
if (tx != null)
tx.commit();
@@ -1050,11 +1052,11 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
Integer exp = (startVal ? 2 : 0) + 3;
-assertEquals(exp, cache.get("key"));
+assertEquals(exp, cache.get(key));
for (int i = 0; i < gridCount(); i++) {
-if
(ignite(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), "key"))
-assertEquals(exp, peek(jcache(i), "key"));
+if
(ignite(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key))
+assertEquals(exp, peek(jcache(i), key));
}
}
[10/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b23ea747 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b23ea747 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b23ea747 Branch: refs/heads/master Commit: b23ea747d9cf351f607d60f520781f5d46e98715 Parents: 08d134d c1eee18 Author: Yakov Zhdanov Authored: Thu Jun 18 13:47:19 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jun 18 13:47:19 2015 +0300 -- .../ignite/internal/processors/cache/IgniteCacheProxy.java| 5 + .../ignite/internal/processors/query/GridQueryProcessor.java | 7 +++ 2 files changed, 12 insertions(+) --
[48/50] incubator-ignite git commit: #IGNITE Added message on init stop.
#IGNITE Added message on init stop.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/16059962
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/16059962
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/16059962
Branch: refs/heads/master
Commit: 16059962e303f7580c6524b1e0f93c2dcce9eaa4
Parents: de0930d
Author: nikolay_tikhonov
Authored: Mon Jun 22 15:30:48 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Jun 22 15:30:48 2015 +0300
--
.../ignite/internal/MarshallerContextImpl.java | 12 +-
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++
.../testsuites/IgniteCacheTestSuite3.java | 1 +
3 files changed, 130 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16059962/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 48f24ac..9f7c983 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -124,10 +124,18 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
/** {@inheritDoc} */
@Override protected String className(int id) throws IgniteCheckedException
{
-if (cache == null)
+GridCacheAdapter cache0 = cache;
+
+if (cache0 == null) {
U.awaitQuiet(latch);
-String clsName = cache.get(id);
+cache0 = cache;
+
+if (cache0 == null)
+throw new IllegalStateException("Failed to initialize
marshaller context (grid is stopping).");
+}
+
+String clsName = cache0.get(id);
if (clsName == null) {
File file = new File(workDir, id + ".classname");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16059962/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeStopSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeStopSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeStopSelfTest.java
new file mode 100644
index 000..c56ad1c
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeStopSelfTest.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Test cache operations with daemon node.
+ */
+public class GridCacheDaemonNodeStopSelfTest extends GridCommonAbstractTest {
+/** */
+private static TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** Daemon flag. */
+protected boolean daemon;
+
+/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+super.beforeTest();
+
+daemon = false;
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration c = super.getConfiguration(gridName);
+
+c.setDaemon(daemon);
+
+
[07/50] incubator-ignite git commit: # ignite-sprint-6 more info in test assert
# ignite-sprint-6 more info in test assert
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d874b00d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d874b00d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d874b00d
Branch: refs/heads/master
Commit: d874b00dcb1687339adc34b6212e8cbc5b9ffe16
Parents: 6c683c2
Author: sboikov
Authored: Thu Jun 18 11:07:04 2015 +0300
Committer: sboikov
Committed: Thu Jun 18 11:07:04 2015 +0300
--
.../IgniteCacheAbstractStopBusySelfTest.java| 30
.../IgniteCacheAtomicStopBusySelfTest.java | 8 +++---
...gniteCacheTransactionalStopBusySelfTest.java | 8 +++---
3 files changed, 26 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d874b00d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
index 10b14cc..074f6ff 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
@@ -36,9 +36,13 @@ import org.apache.ignite.testframework.junits.common.*;
import org.jetbrains.annotations.*;
import java.io.*;
+import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+
/**
*
*/
@@ -53,7 +57,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest
extends GridCommonAbst
public static final String CACHE_NAME = "StopTest";
/** */
-public static final TcpDiscoveryIpFinder finder = new
TcpDiscoveryVmIpFinder(true);
+public final TcpDiscoveryIpFinder finder = new
TcpDiscoveryVmIpFinder(true);
/** */
private AtomicBoolean suspended = new AtomicBoolean(false);
@@ -62,7 +66,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest
extends GridCommonAbst
private CountDownLatch blocked;
/** */
-protected AtomicReference bannedMessage = new AtomicReference<>();
+protected AtomicReference bannedMsg = new AtomicReference<>();
/**
* @return Cache mode.
@@ -93,9 +97,9 @@ public abstract class IgniteCacheAbstractStopBusySelfTest
extends GridCommonAbst
if (gridName.endsWith(String.valueOf(CLN_GRD)))
cfg.setClientMode(true);
-cacheCfg.setRebalanceMode(CacheRebalanceMode.SYNC);
+cacheCfg.setRebalanceMode(SYNC);
-
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setBackups(1);
@@ -125,14 +129,14 @@ public abstract class IgniteCacheAbstractStopBusySelfTest
extends GridCommonAbst
TimeUnit.MILLISECONDS.sleep(100L);
}
-assert clientNode().cluster().nodes().size() == 2;
+assertEquals(2, clientNode().cluster().nodes().size());
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
suspended.set(false);
-bannedMessage.set(null);
+bannedMsg.set(null);
afterTestsStopped();
@@ -140,7 +144,9 @@ public abstract class IgniteCacheAbstractStopBusySelfTest
extends GridCommonAbst
stopGrid(CLN_GRD);
-assert G.allGrids().isEmpty();
+List nodes = G.allGrids();
+
+assertTrue("Unexpected nodes: " + nodes, nodes.isEmpty());
}
/**
@@ -203,12 +209,11 @@ public abstract class IgniteCacheAbstractStopBusySelfTest
extends GridCommonAbst
* @throws Exception If failed.
*/
public void testGet() throws Exception {
-bannedMessage.set(GridNearGetRequest.class);
+bannedMsg.set(GridNearGetRequest.class);
executeTest(new Callable() {
/** {@inheritDoc} */
-@Override
-public Integer call() throws Exception {
+@Override public Integer call() throws Exception {
info("Start operation.");
Integer put = (Integer) clientCache().get(1);
@@ -318,6 +323,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest
extends GridCommonAbst
* @return Cache configuration.
* @throws Exception In case of error.
*/
+@SuppressWarnings("unchecked")
[24/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1034' into ignite-1034
Merge remote-tracking branch 'origin/ignite-1034' into ignite-1034 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ef4abeba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef4abeba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef4abeba Branch: refs/heads/master Commit: ef4abeba881f079cab08af9ade99fe52ecf5d26d Parents: 462495f 49dc4a5 Author: sboikov Authored: Fri Jun 19 12:02:31 2015 +0300 Committer: sboikov Committed: Fri Jun 19 12:02:31 2015 +0300 -- --
[46/50] incubator-ignite git commit: #IGNITE-GG-10449 Fixed license.
#IGNITE-GG-10449 Fixed license. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c1ecc3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c1ecc3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c1ecc3d Branch: refs/heads/master Commit: 7c1ecc3dd2e240e48958c8fb1fd812a6df7e92b5 Parents: a3d8e60 Author: nikolay_tikhonov Authored: Mon Jun 22 13:15:55 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Jun 22 13:15:55 2015 +0300 -- .../cache/IgniteCacheOffheapEvictQueryTest.java| 17 + 1 file changed, 17 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c1ecc3d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java index 72bfcaa..45d744e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*;
[43/50] incubator-ignite git commit: #IGNITE-GG-10449 marshal credentials in client discovery.
#IGNITE-GG-10449 marshal credentials in client discovery.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a3d8e603
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a3d8e603
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a3d8e603
Branch: refs/heads/master
Commit: a3d8e603a5c9a7fbf3f81a7dd2aded2a8139f578
Parents: 1cc
Author: nikolay_tikhonov
Authored: Mon Jun 22 11:33:53 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Jun 22 11:33:53 2015 +0300
--
.../ignite/spi/discovery/tcp/ClientImpl.java| 23
1 file changed, 23 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3d8e603/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index e255e08..68e5dbd 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -362,6 +362,9 @@ class ClientImpl extends TcpDiscoveryImpl {
long startTime = U.currentTimeMillis();
+// Marshal credentials for backward compatibility and security.
+marshalCredentials(locNode);
+
while (true) {
if (Thread.currentThread().isInterrupted())
throw new InterruptedException();
@@ -541,6 +544,26 @@ class ClientImpl extends TcpDiscoveryImpl {
return null;
}
+/**
+ * Marshalls credentials with discovery SPI marshaller (will replace
attribute value).
+ *
+ * @param node Node to marshall credentials for.
+ * @throws IgniteSpiException If marshalling failed.
+ */
+private void marshalCredentials(TcpDiscoveryNode node) throws
IgniteSpiException {
+try {
+// Use security-unsafe getter.
+Map attrs = new HashMap<>(node.getAttributes());
+
+attrs.put(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS,
+
spi.marsh.marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS)));
+
+node.setAttributes(attrs);
+}
+catch (IgniteCheckedException e) {
+throw new IgniteSpiException("Failed to marshal node security
credentials: " + node.id(), e);
+}
+}
/**
* @param topVer New topology version.
[18/50] incubator-ignite git commit: Fixed test.
Fixed 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/4f3292d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f3292d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f3292d5
Branch: refs/heads/master
Commit: 4f3292d5d8b29c04fcc1bf1fa9b88e5f19ceddfe
Parents: d874b00
Author: nikolay tikhonov
Authored: Thu Jun 18 15:19:03 2015 +0300
Committer: nikolay tikhonov
Committed: Thu Jun 18 15:19:03 2015 +0300
--
.../apache/ignite/internal/GridSelfTest.java| 20
1 file changed, 12 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f3292d5/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
index eccae34..2de04b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
@@ -112,7 +112,9 @@ public class GridSelfTest extends
GridProjectionAbstractTest {
*/
@SuppressWarnings({"TooBroadScope"})
public void testAsyncListen() throws Exception {
-final String msg = "HELLO!";
+final String hello = "HELLO!";
+
+final String bye = "BYE!";
final Ignite g = grid(0);
@@ -120,10 +122,12 @@ public class GridSelfTest extends
GridProjectionAbstractTest {
g.message().remoteListen(null, new MessagingListenActor() {
@Override protected void receive(UUID nodeId, String rcvMsg)
throws Throwable {
-assertEquals(locNodeId, nodeId);
-assertEquals(msg, rcvMsg);
+if (hello.equals(rcvMsg)) {
+assertEquals(locNodeId, nodeId);
+assertEquals(hello, rcvMsg);
-stop(rcvMsg);
+stop(bye);
+}
}
});
@@ -131,22 +135,22 @@ public class GridSelfTest extends
GridProjectionAbstractTest {
g.message().localListen(null, new P2() {
@Override public boolean apply(UUID nodeId, String msg) {
-if (!locNodeId.equals(nodeId))
+if (msg.equals(bye))
cnt.incrementAndGet();
return true;
}
});
-g.message().send(null, msg);
+g.message().send(null, hello);
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
-return cnt.get() == g.cluster().forRemotes().nodes().size();
+return cnt.get() == g.cluster().nodes().size();
}
}, 5000);
-assertEquals(cnt.get(), g.cluster().forRemotes().nodes().size());
+assertEquals(cnt.get(), g.cluster().nodes().size());
}
/**
[30/50] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bcfbb923 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bcfbb923 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bcfbb923 Branch: refs/heads/master Commit: bcfbb9236e860115dfc70da9f717aaba7cb9544c Parents: 23512df d699faa Author: S.Vladykin Authored: Fri Jun 19 13:31:39 2015 +0300 Committer: S.Vladykin Committed: Fri Jun 19 13:31:39 2015 +0300 -- examples/pom.xml| 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../communication/tcp/TcpCommunicationSpi.java | 42 +-- .../ignite/spi/discovery/tcp/ServerImpl.java| 35 .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +-- .../tcp/internal/TcpDiscoveryNode.java | 18 .../core/src/main/resources/ignite.properties | 2 +- .../apache/ignite/internal/GridSelfTest.java| 20 + .../DataStreamerMultiThreadedSelfTest.java | 3 ++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++-- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 44 files changed, 189 insertions(+), 89 deletions(-) --
[50/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6'
Merge remote-tracking branch 'origin/ignite-sprint-6' # Conflicts: # examples/pom.xml # modules/aop/pom.xml # modules/aws/pom.xml # modules/clients/pom.xml # modules/cloud/pom.xml # modules/codegen/pom.xml # modules/core/pom.xml # modules/extdata/p2p/pom.xml # modules/extdata/uri/pom.xml # modules/gce/pom.xml # modules/geospatial/pom.xml # modules/hadoop/pom.xml # modules/hibernate/pom.xml # modules/indexing/pom.xml # modules/jcl/pom.xml # modules/jta/pom.xml # modules/log4j/pom.xml # modules/rest-http/pom.xml # modules/scalar/pom.xml # modules/schedule/pom.xml # modules/schema-import/pom.xml # modules/slf4j/pom.xml # modules/spring/pom.xml # modules/ssh/pom.xml # modules/tools/pom.xml # modules/urideploy/pom.xml # modules/visor-console/pom.xml # modules/visor-plugins/pom.xml # modules/web/pom.xml # modules/yardstick/pom.xml # pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9fe9996 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9fe9996 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9fe9996 Branch: refs/heads/master Commit: f9fe99963fd3defab639e9700dffc965cdd39bb1 Parents: 8a6a7cb 285d790 Author: Andrey Authored: Wed Jun 24 18:00:24 2015 +0700 Committer: Andrey Committed: Wed Jun 24 18:00:24 2015 +0700 -- .gitignore |3 +- DEVNOTES.txt| 73 +- RELEASE_NOTES.txt | 12 + assembly/dependencies-fabric.xml|1 + assembly/dependencies-visor-console.xml |3 + bin/ignite-schema-import.bat|2 +- bin/ignite-schema-import.sh |2 +- bin/ignite.bat |2 +- bin/ignite.sh |2 +- bin/ignitevisorcmd.bat |2 +- bin/ignitevisorcmd.sh |2 +- bin/include/functions.sh|2 +- dev-tools/.gitignore|2 + dev-tools/build.gradle | 54 + .../gradle/wrapper/gradle-wrapper.properties| 20 + dev-tools/gradlew | 233 + dev-tools/slurp.sh | 76 + dev-tools/src/main/groovy/jiraslurp.groovy | 544 ++ examples/config/example-cache.xml |2 + examples/pom.xml| 36 +- .../hibernate/CacheHibernatePersonStore.java| 202 +- .../hibernate/CacheHibernateStoreExample.java | 17 + .../store/jdbc/CacheJdbcPersonStore.java| 180 +- .../store/jdbc/CacheJdbcStoreExample.java | 13 + .../store/spring/CacheSpringPersonStore.java| 128 + .../store/spring/CacheSpringStoreExample.java | 143 + .../datagrid/store/spring/package-info.java | 22 + .../client/memcache/MemcacheRestExample.java| 32 +- .../streaming/StreamTransformerExample.java |4 +- .../streaming/StreamVisitorExample.java |4 +- .../ignite/examples/streaming/package-info.java |1 - .../streaming/wordcount/CacheConfig.java|2 +- .../streaming/wordcount/QueryWords.java | 12 +- .../streaming/wordcount/StreamWords.java| 12 +- .../streaming/wordcount/package-info.java |1 - .../socket/WordsSocketStreamerClient.java | 82 + .../socket/WordsSocketStreamerServer.java | 124 + .../wordcount/socket/package-info.java | 21 + idea/ignite_codeStyle.xml | 147 + modules/aop/pom.xml |2 +- modules/aws/pom.xml |2 +- .../s3/S3CheckpointManagerSelfTest.java |2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java |4 +- .../s3/S3CheckpointSpiStartStopSelfTest.java|2 +- .../s3/S3SessionCheckpointSelfTest.java |2 +- .../s3/TcpDiscoveryS3IpFinderSelfTest.java |2 +- modules/clients/pom.xml |2 +- .../ClientAbstractConnectivitySelfTest.java | 14 + .../client/router/TcpSslRouterSelfTest.java |5 + .../client/suite/IgniteClientTestSuite.java |3 +- modules/cloud/pom.xml |4 +- .../cloud/TcpDiscoveryCloudIpFinder.java| 25 +- .../TcpDiscoveryCloudIpFinderSelfTest.java |5 +- modules/codegen/pom.xml |2 +- modules/core/pom.xml|3 +- .../src/main/java/org/apache/ignite/Ignite.java |8 +- .../java/org/apache/ignite/IgniteCache.java | 41 +- .../java/org/apache/ignite/I
[21/50] incubator-ignite git commit: IGNITE-1034 - Drop slow clients.
IGNITE-1034 - Drop slow clients.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44bbecea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44bbecea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44bbecea
Branch: refs/heads/master
Commit: 44bbeceae657058eee322b13e339966c625802db
Parents: ad0a026
Author: Alexey Goncharuk
Authored: Thu Jun 18 19:06:47 2015 -0700
Committer: Alexey Goncharuk
Committed: Thu Jun 18 19:06:47 2015 -0700
--
.../internal/managers/GridManagerAdapter.java | 4 +
.../discovery/GridDiscoveryManager.java | 15 +++
.../ignite/internal/util/nio/GridNioServer.java | 51
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 +
.../org/apache/ignite/spi/IgniteSpiContext.java | 5 +
.../communication/tcp/TcpCommunicationSpi.java | 73 +++
.../ignite/spi/discovery/tcp/ServerImpl.java| 5 +
.../IgniteSlowClientDetectionSelfTest.java | 124 +++
.../testframework/GridSpiTestContext.java | 5 +
9 files changed, 287 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44bbecea/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index bea4256..885d52c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -484,6 +484,10 @@ public abstract class GridManagerAdapter implements GridMan
return ctx.discovery().tryFailNode(nodeId);
}
+@Override public void failNode(UUID nodeId) {
+ctx.discovery().failNode(nodeId);
+}
+
@Override public void
addTimeoutObject(IgniteSpiTimeoutObject obj) {
ctx.timeout().addTimeoutObject(new
GridSpiTimeoutObject(obj));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44bbecea/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 464110c..717cdf3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -1502,6 +1502,21 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
/**
+ * @param nodeId Node ID to fail.
+ */
+public void failNode(UUID nodeId) {
+if (!busyLock.enterBusy())
+return;
+
+try {
+getSpi().failNode(nodeId);
+}
+finally {
+busyLock.leaveBusy();
+}
+}
+
+/**
* Updates topology version if current version is smaller than updated.
*
* @param updated Updated topology version.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44bbecea/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 88fad71..b9d246a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -116,6 +116,10 @@ public class GridNioServer {
@SuppressWarnings("UnusedDeclaration")
private boolean skipWrite;
+/** For test purposes only. */
+@SuppressWarnings("UnusedDeclaration")
+private boolean skipRead;
+
/** Local address. */
private final InetSocketAddress locAddr;
@@ -145,6 +149,9 @@ public class GridNioServer {
@GridToStringExclude
private IgnitePredicate skipRecoveryPred;
+/** Optional listener to monitor outbound message queue size. */
+private IgniteBiInClosure msgQueueLsnr;
+
/** Static initializer ensures single-threaded execution of workaround. */
static {
// This is a workaround
[29/50] incubator-ignite git commit: ignite-973 - swap manager fix + offheap processor signatures fix
ignite-973 - swap manager fix + offheap processor signatures fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23512df8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23512df8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23512df8
Branch: refs/heads/master
Commit: 23512df815c196f9a2292ad948b130380f123770
Parents: b23ea74
Author: S.Vladykin
Authored: Fri Jun 19 13:31:27 2015 +0300
Committer: S.Vladykin
Committed: Fri Jun 19 13:31:27 2015 +0300
--
.../processors/cache/GridCacheSwapManager.java | 12 +-
.../offheap/GridOffHeapProcessor.java | 19 +-
.../apache/ignite/internal/util/GridDebug.java | 37 ++--
.../cache/IgniteCacheOffheapEvictQueryTest.java | 179 +++
.../IgniteCacheQuerySelfTestSuite.java | 1 +
5 files changed, 220 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23512df8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index d0d9049..f709e03 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -977,15 +977,15 @@ public class GridCacheSwapManager extends
GridCacheManagerAdapter {
// First try offheap.
if (offheapEnabled) {
-byte[] val = offheap.remove(spaceName, part,
key.value(cctx.cacheObjectContext(), false),
-key.valueBytes(cctx.cacheObjectContext()));
-
-if(val != null && cctx.config().isStatisticsEnabled())
-cctx.cache().metrics0().onOffHeapRemove();
+// TODO Pass closure c to offheap.remove and apply it before the
actual remove.
+byte[] val = offheap.remove(spaceName, part, key,
key.valueBytes(cctx.cacheObjectContext()));
if (val != null) {
+if (cctx.config().isStatisticsEnabled())
+cctx.cache().metrics0().onOffHeapRemove();
+
if (c != null)
-c.apply(val); // Probably we should read value and apply
closure before removing...
+c.apply(val);
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23512df8/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
index a99c4c0..81bf9f2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.offheap;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.offheap.*;
@@ -101,7 +102,7 @@ public class GridOffHeapProcessor extends
GridProcessorAdapter {
* @return Key bytes
* @throws IgniteCheckedException If failed.
*/
-private byte[] keyBytes(Object key, @Nullable byte[] keyBytes) throws
IgniteCheckedException {
+private byte[] keyBytes(KeyCacheObject key, @Nullable byte[] keyBytes)
throws IgniteCheckedException {
assert key != null;
return keyBytes != null ? keyBytes : marsh.marshal(key);
@@ -130,7 +131,7 @@ public class GridOffHeapProcessor extends
GridProcessorAdapter {
* @return {@code true} If offheap space contains value for the given key.
* @throws IgniteCheckedException If failed.
*/
-public boolean contains(@Nullable String spaceName, int part, Object key,
byte[] keyBytes)
+public boolean contains(@Nullable String spaceName, int part,
KeyCacheObject key, byte[] keyBytes)
throws IgniteCheckedException {
GridOffHeapPartitionedMap m = offheap(spaceName);
@@ -147,7 +148,7 @@ public class GridOffHeapProcessor extends
GridProcessorAdapter {
* @retur
[37/50] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de27ff1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de27ff1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de27ff1b Branch: refs/heads/master Commit: de27ff1b8788b622937b17bfeaf8941242914d1a Parents: bcfbb92 415264e Author: S.Vladykin Authored: Mon Jun 22 09:21:46 2015 +0300 Committer: S.Vladykin Committed: Mon Jun 22 09:21:46 2015 +0300 -- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 30 ++- .../GridCachePartitionExchangeManager.java | 1 + .../continuous/CacheContinuousQueryHandler.java | 8 + .../ignite/internal/util/nio/GridNioServer.java | 64 ++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 9 +- .../communication/tcp/TcpCommunicationSpi.java | 71 +++ .../tcp/TcpCommunicationSpiMBean.java | 11 ++ .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 17 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 6 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 18 ++ ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../IgniteSlowClientDetectionSelfTest.java | 187 +++ .../testframework/GridSpiTestContext.java | 7 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../cache/jta/GridCacheXAResource.java | 18 +- .../processors/cache/GridCacheJtaSelfTest.java | 2 +- 21 files changed, 467 insertions(+), 33 deletions(-) --
[41/50] incubator-ignite git commit: Merge branches 'ignite-973' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6
Merge branches 'ignite-973' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1cc0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1cc0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1cc0 Branch: refs/heads/master Commit: 1cc0a641f3d52964710377a8c29d9ff59947 Parents: 309eeb0 774bc94 Author: S.Vladykin Authored: Mon Jun 22 09:47:29 2015 +0300 Committer: S.Vladykin Committed: Mon Jun 22 09:47:29 2015 +0300 -- .../processors/cache/GridCacheSwapManager.java | 12 +- .../offheap/GridOffHeapProcessor.java | 19 +- .../apache/ignite/internal/util/GridDebug.java | 37 ++-- .../processors/query/h2/IgniteH2Indexing.java | 2 + .../query/h2/twostep/GridMapQueryExecutor.java | 23 ++- .../cache/IgniteCacheOffheapEvictQueryTest.java | 179 +++ .../IgniteCacheQuerySelfTestSuite.java | 1 + 7 files changed, 233 insertions(+), 40 deletions(-) --
[11/50] incubator-ignite git commit: # ignite-1003 add lastSuccessfulAddr for ping
# ignite-1003 add lastSuccessfulAddr for ping
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b23f9300
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b23f9300
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b23f9300
Branch: refs/heads/master
Commit: b23f9300794c7e84dfc83c1b8e49de673fa354e1
Parents: d874b00
Author: sboikov
Authored: Thu Jun 18 13:52:45 2015 +0300
Committer: sboikov
Committed: Thu Jun 18 13:52:45 2015 +0300
--
.../communication/tcp/TcpCommunicationSpi.java | 38 ++--
.../ignite/spi/discovery/tcp/ServerImpl.java| 21 +++
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 -
.../tcp/internal/TcpDiscoveryNode.java | 18 ++
4 files changed, 60 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b23f9300/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 9e38788..39f4eeb 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
@@ -267,23 +267,19 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
if (!isNodeStopping()) {
GridNioRecoveryDescriptor recoveryData =
ses.recoveryDescriptor();
-if (!getSpiContext().tryFailNode(id)) {
-if (recoveryData != null) {
-if
(recoveryData.nodeAlive(getSpiContext().node(id))) {
-if
(!recoveryData.messagesFutures().isEmpty()) {
-if (log.isDebugEnabled())
-log.debug("Session was closed
but there are unacknowledged messages, " +
-"will try to reconnect
[rmtNode=" + recoveryData.node().id() + ']');
-
-
commWorker.addReconnectRequest(recoveryData);
-}
+if (recoveryData != null) {
+if
(recoveryData.nodeAlive(getSpiContext().node(id))) {
+if
(!recoveryData.messagesFutures().isEmpty()) {
+if (log.isDebugEnabled())
+log.debug("Session was closed but
there are unacknowledged messages, " +
+"will try to reconnect
[rmtNode=" + recoveryData.node().id() + ']');
+
+
commWorker.addReconnectRequest(recoveryData);
}
-else
-recoveryData.onNodeLeft();
}
+else
+recoveryData.onNodeLeft();
}
-else
-recoveryData.onNodeLeft();
}
}
@@ -1884,18 +1880,20 @@ public class TcpCommunicationSpi extends
IgniteSpiAdapter
"TCP communication addresses or mapped external addresses.
Check configuration and make sure " +
"that you use the same communication SPI on all nodes. Remote
node id: " + node.id());
-List addrs;
+LinkedHashSet addrs;
// Try to connect first on bound addresses.
if (isRmtAddrsExist) {
-addrs = new ArrayList<>(U.toSocketAddresses(rmtAddrs0,
rmtHostNames0, boundPort));
+List addrs0 = new
ArrayList<>(U.toSocketAddresses(rmtAddrs0, rmtHostNames0, boundPort));
boolean sameHost = U.sameMacs(getSpiContext().localNode(), node);
-Collections.sort(addrs, U.inetAddressesComparator(sameHost));
+Collections.sort(addrs0, U.inetAddressesComparator(sameHost));
+
+addrs = new LinkedHashSet<>(addrs0);
}
else
-addrs = new ArrayList<>();
+addrs = new LinkedHashSet<>();
// Then on mapped external addresses.
if (isExtAddrsExist)
@@ -2610,7 +2608,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
private void p
[33/50] incubator-ignite git commit: # fix for jta issue
# fix for jta issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20ac4b80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20ac4b80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20ac4b80
Branch: refs/heads/master
Commit: 20ac4b80ce90422268e90e9ef3cd9a84cbcfac2d
Parents: 4d9868a
Author: Yakov Zhdanov
Authored: Fri Jun 19 21:27:35 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Jun 19 21:27:35 2015 +0300
--
.../cache/GridCachePartitionExchangeManager.java | 1 +
.../processors/cache/jta/GridCacheXAResource.java | 18 +-
.../processors/cache/GridCacheJtaSelfTest.java| 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20ac4b80/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 3df45cb..ad4cf50 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -771,6 +771,7 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
}
}
}
+
if (skipped > 10)
fut.cleanUp();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20ac4b80/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
--
diff --git
a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
index 505f558..442cdde 100644
---
a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
+++
b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
@@ -209,7 +209,14 @@ public final class GridCacheXAResource implements
XAResource {
/** {@inheritDoc} */
@Override public int getTransactionTimeout() {
-return (int)cacheTx.timeout();
+return (int)(cacheTx.timeout() / 1000);
+}
+
+/** {@inheritDoc} */
+@Override public boolean setTransactionTimeout(int i) {
+cacheTx.timeout(i * 1000);
+
+return true;
}
/** {@inheritDoc} */
@@ -217,7 +224,7 @@ public final class GridCacheXAResource implements
XAResource {
if (xar == this)
return true;
-if (!(xar instanceof GridCacheXAResource))
+if (!(xar instanceof GridCacheXAResource))
return false;
GridCacheXAResource other = (GridCacheXAResource)xar;
@@ -225,13 +232,6 @@ public final class GridCacheXAResource implements
XAResource {
return cctx == other.cctx;
}
-/** {@inheritDoc} */
-@Override public boolean setTransactionTimeout(int i) {
-cacheTx.timeout(i);
-
-return true;
-}
-
/**
*
* @return {@code true} if jta was already committed or rolled back.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20ac4b80/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
--
diff --git
a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
index cb7b4d6..b299f8d 100644
---
a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
+++
b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
@@ -152,7 +152,7 @@ public class GridCacheJtaSelfTest extends
GridCacheAbstractSelfTest {
@SuppressWarnings("ConstantConditions")
public void testJtaTwoCaches() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-591";);
-
+
UserTransaction jtaTx = jotm.getUserTransaction();
IgniteEx ignite = grid(0);
[14/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb862b65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb862b65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb862b65 Branch: refs/heads/master Commit: cb862b65ffc1e0ecfc9a93b6af10881586df1ede Parents: 5011c2b ca81476 Author: Yakov Zhdanov Authored: Thu Jun 18 14:50:56 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jun 18 14:50:56 2015 +0300 -- .../datastreamer/DataStreamerMultiThreadedSelfTest.java | 3 +++ 1 file changed, 3 insertions(+) --
[17/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1003' into ignite-sprint-6
Merge remote-tracking branch 'remotes/origin/ignite-1003' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d1fa723 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d1fa723 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d1fa723 Branch: refs/heads/master Commit: 4d1fa7235c1381bacaaeaf458658675d2ba34923 Parents: 31cf802 b23f930 Author: sboikov Authored: Thu Jun 18 15:15:49 2015 +0300 Committer: sboikov Committed: Thu Jun 18 15:15:49 2015 +0300 -- .../communication/tcp/TcpCommunicationSpi.java | 38 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java| 21 +++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 - .../tcp/internal/TcpDiscoveryNode.java | 18 ++ 4 files changed, 60 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java --
[12/50] incubator-ignite git commit: # ignite-sprint-6 disabled shmem for test
# ignite-sprint-6 disabled shmem for 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/ca81476d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca81476d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca81476d
Branch: refs/heads/master
Commit: ca81476d1ab66773815c7e3f91d61ea5b0651bb9
Parents: b23ea74
Author: sboikov
Authored: Thu Jun 18 14:21:34 2015 +0300
Committer: sboikov
Committed: Thu Jun 18 14:21:34 2015 +0300
--
.../datastreamer/DataStreamerMultiThreadedSelfTest.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca81476d/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
index e0092d4..c37219a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.communication.tcp.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -48,6 +49,8 @@ public class DataStreamerMultiThreadedSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
[06/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c683c28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c683c28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c683c28 Branch: refs/heads/master Commit: 6c683c28f5bde0cf22ac7482bc381c861a2c6a62 Parents: cc20ef6 45939ac Author: sboikov Authored: Thu Jun 18 10:36:28 2015 +0300 Committer: sboikov Committed: Thu Jun 18 10:36:28 2015 +0300 -- .../ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java| 2 +- .../apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 ++-- .../spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java | 2 +- .../ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java| 2 +- .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) --
[23/50] incubator-ignite git commit: # ignite-1034 fixed assert in discovery manager, warning on all nodes, improved test
# ignite-1034 fixed assert in discovery manager, warning on all nodes, improved
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/462495f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/462495f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/462495f2
Branch: refs/heads/master
Commit: 462495f2977668ae9353adecef554c4f15dd70f3
Parents: 44bbece
Author: sboikov
Authored: Fri Jun 19 10:12:20 2015 +0300
Committer: sboikov
Committed: Fri Jun 19 11:47:14 2015 +0300
--
.../internal/managers/GridManagerAdapter.java | 8 +--
.../discovery/GridDiscoveryManager.java | 19 --
.../continuous/CacheContinuousQueryHandler.java | 8 +++
.../ignite/internal/util/nio/GridNioServer.java | 13 ++--
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 20 +++---
.../tcp/TcpCommunicationSpiMBean.java | 11
.../ignite/spi/discovery/DiscoverySpi.java | 3 +-
.../ignite/spi/discovery/tcp/ClientImpl.java| 12 +++-
.../ignite/spi/discovery/tcp/ServerImpl.java| 12 +++-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 6 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 18 +
...ridFailFastNodeFailureDetectionSelfTest.java | 17 -
.../IgniteSlowClientDetectionSelfTest.java | 69 +++-
.../testframework/GridSpiTestContext.java | 4 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 +
18 files changed, 189 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/462495f2/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 885d52c..40a5ea5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -480,12 +480,12 @@ public abstract class GridManagerAdapter implements GridMan
return ctx.io().messageFactory();
}
-@Override public boolean tryFailNode(UUID nodeId) {
-return ctx.discovery().tryFailNode(nodeId);
+@Override public boolean tryFailNode(UUID nodeId,
@Nullable String warning) {
+return ctx.discovery().tryFailNode(nodeId, warning);
}
-@Override public void failNode(UUID nodeId) {
-ctx.discovery().failNode(nodeId);
+@Override public void failNode(UUID nodeId, @Nullable
String warning) {
+ctx.discovery().failNode(nodeId, warning);
}
@Override public void
addTimeoutObject(IgniteSpiTimeoutObject obj) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/462495f2/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 717cdf3..1e4b972 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -386,9 +386,13 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
verChanged = false;
}
else {
-minorTopVer = 0;
+if (type != EVT_NODE_SEGMENTED) {
+minorTopVer = 0;
-verChanged = true;
+verChanged = true;
+}
+else
+verChanged = false;
}
AffinityTopologyVersion nextTopVer = new
AffinityTopologyVersion(topVer, minorTopVer);
@@ -1481,15 +1485,16 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/**
* @param nodeId Node ID.
+ * @param warning Warning message to be shown on all nodes.
* @return Whether node is failed.
*/
-public boolean
[19/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c404f78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c404f78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c404f78 Branch: refs/heads/master Commit: 8c404f78cc264ddf43c71904b9fbac40ce0ee418 Parents: 4f3292d 4d1fa72 Author: nikolay tikhonov Authored: Thu Jun 18 15:19:58 2015 +0300 Committer: nikolay tikhonov Committed: Thu Jun 18 15:19:58 2015 +0300 -- .../processors/cache/GridCacheUtils.java| 9 + .../processors/cache/IgniteCacheProxy.java | 5 +++ .../processors/query/GridQueryProcessor.java| 7 .../communication/tcp/TcpCommunicationSpi.java | 42 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java| 31 +++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 41 +-- .../tcp/internal/TcpDiscoveryNode.java | 18 + .../DataStreamerMultiThreadedSelfTest.java | 3 ++ 8 files changed, 115 insertions(+), 41 deletions(-) --
[47/50] incubator-ignite git commit: Merge branch 'ignite-gg-10449' into ignite-sprint-6
Merge branch 'ignite-gg-10449' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de0930d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de0930d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de0930d3 Branch: refs/heads/master Commit: de0930d3b92141a360ea6a2cc346035158572dcf Parents: a4ce455 7c1ecc3 Author: nikolay_tikhonov Authored: Mon Jun 22 14:05:28 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Jun 22 14:05:28 2015 +0300 -- .../ignite/spi/discovery/tcp/ClientImpl.java| 23 .../cache/IgniteCacheOffheapEvictQueryTest.java | 17 +++ 2 files changed, 40 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de0930d3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java --
[28/50] incubator-ignite git commit: # ignite-1034
# ignite-1034 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d34f3294 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d34f3294 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d34f3294 Branch: refs/heads/master Commit: d34f3294fbe120c443448e4df201fc9337725706 Parents: 895771a Author: sboikov Authored: Fri Jun 19 13:27:26 2015 +0300 Committer: sboikov Committed: Fri Jun 19 13:27:26 2015 +0300 -- .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d34f3294/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 bbb9b1c..a540b7c 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 @@ -611,11 +611,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter @LoggerResource private IgniteLogger log; -/** Ignite. */ -@IgniteInstanceResource -@GridToStringExclude -private Ignite ignite; - /** Local IP address. */ private String locAddr;
[34/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0e1994d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0e1994d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0e1994d Branch: refs/heads/master Commit: e0e1994dd51d81b0d7d47000db1678f0268c0bfd Parents: 20ac4b8 e1b8800 Author: Yakov Zhdanov Authored: Fri Jun 19 21:28:12 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Jun 19 21:28:12 2015 +0300 -- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 30 ++- .../continuous/CacheContinuousQueryHandler.java | 8 + .../ignite/internal/util/nio/GridNioServer.java | 64 ++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 9 +- .../communication/tcp/TcpCommunicationSpi.java | 69 +++ .../tcp/TcpCommunicationSpiMBean.java | 11 ++ .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 17 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 6 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 18 ++ ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../IgniteSlowClientDetectionSelfTest.java | 187 +++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 - .../testframework/GridSpiTestContext.java | 7 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + 19 files changed, 495 insertions(+), 26 deletions(-) --
