You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/08/21 16:34:05 UTC
[1/5] incubator-ignite git commit: GG-9615 Interop .Net: Implement
GridServices API.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1258 dd12aac53 -> ceda2afe5
GG-9615 Interop .Net: Implement GridServices API.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c55d9231
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c55d9231
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c55d9231
Branch: refs/heads/ignite-1258
Commit: c55d9231f5fc9459c7964bb2c3d46eb9f214d2c2
Parents: abafd41
Author: ptupitsyn <pt...@gridgain.com>
Authored: Fri Aug 21 15:09:59 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Fri Aug 21 15:09:59 2015 +0300
----------------------------------------------------------------------
.../internal/processors/service/GridServiceProcessor.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c55d9231/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 78b09e6..0f43b8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -651,6 +651,11 @@ public class GridServiceProcessor extends GridProcessorAdapter {
private void reassign(GridServiceDeployment dep, long topVer) throws IgniteCheckedException {
ServiceConfiguration cfg = dep.configuration();
+ Object nodeFilter = cfg.getNodeFilter();
+
+ if (nodeFilter != null)
+ ctx.resource().injectGeneric(nodeFilter);
+
int totalCnt = cfg.getTotalCount();
int maxPerNodeCnt = cfg.getMaxPerNodeCount();
String cacheName = cfg.getCacheName();
[2/5] incubator-ignite git commit: Added failover test for cross
cache transactions,
fixed GridDistributedCacheEntry.checkThreadChain to use proper cache.
Posted by sb...@apache.org.
Added failover test for cross cache transactions, fixed GridDistributedCacheEntry.checkThreadChain to use proper 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/b2cc2ee0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b2cc2ee0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b2cc2ee0
Branch: refs/heads/ignite-1258
Commit: b2cc2ee018260bad1221cf2e30dd175b0605b0ef
Parents: abafd41
Author: sboikov <sb...@gridgain.com>
Authored: Fri Aug 21 15:28:42 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Aug 21 15:28:42 2015 +0300
----------------------------------------------------------------------
.../processors/cache/distributed/GridDistributedCacheEntry.java | 4 +++-
.../internal/processors/cache/local/GridLocalCacheEntry.java | 4 +++-
.../apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2cc2ee0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index e007190..59d75be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -835,8 +835,10 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry {
// Allow next lock in the thread to proceed.
if (!cand.used()) {
+ GridCacheContext cctx0 = cand.parent().context();
+
GridDistributedCacheEntry e =
- (GridDistributedCacheEntry)cctx.cache().peekEx(cand.key());
+ (GridDistributedCacheEntry)cctx0.cache().peekEx(cand.key());
if (e != null)
e.recheck();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2cc2ee0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
index ea59f1f..6c04761 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java
@@ -261,7 +261,9 @@ public class GridLocalCacheEntry extends GridCacheMapEntry {
// Allow next lock in the thread to proceed.
if (!cand.used()) {
- GridLocalCacheEntry e = (GridLocalCacheEntry)cctx.cache().peekEx(cand.key());
+ GridCacheContext cctx0 = cand.parent().context();
+
+ GridLocalCacheEntry e = (GridLocalCacheEntry)cctx0.cache().peekEx(cand.key());
// At this point candidate may have been removed and entry destroyed,
// so we check for null.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2cc2ee0/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
index 97c558a..f3fac23 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
@@ -46,6 +46,8 @@ public class IgniteCacheFailoverTestSuite2 {
suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class);
suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class);
+ suite.addTestSuite(IgniteCacheCrossCacheTxFailoverTest.class);
+
return suite;
}
}
[4/5] incubator-ignite git commit: Added test for cache.lock.
Posted by sb...@apache.org.
Added test for cache.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/653d411c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/653d411c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/653d411c
Branch: refs/heads/ignite-1258
Commit: 653d411ca243494cc5e2ff09cf879103856d5a8a
Parents: 0283580
Author: sboikov <sb...@gridgain.com>
Authored: Fri Aug 21 16:44:15 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Aug 21 16:44:15 2015 +0300
----------------------------------------------------------------------
.../GridCacheMultiNodeLockAbstractTest.java | 41 +++++++++++++++++++-
...idCachePartitionedMultiNodeLockSelfTest.java | 8 +---
...ridCacheReplicatedMultiNodeLockSelfTest.java | 8 +---
3 files changed, 44 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/653d411c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
index 8f107e4..013dd74 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
@@ -41,6 +41,12 @@ import static org.apache.ignite.events.EventType.*;
* Test cases for multi-threaded tests.
*/
public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstractTest {
+ /** */
+ private static final String CACHE1 = null;
+
+ /** */
+ private static final String CACHE2 = "cache2";
+
/** Grid 1. */
private static Ignite ignite1;
@@ -70,12 +76,20 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
cfg.setDiscoverySpi(disco);
- cfg.setCacheConfiguration(defaultCacheConfiguration());
+ CacheConfiguration ccfg1 = cacheConfiguration().setName(CACHE1);
+ CacheConfiguration ccfg2 = cacheConfiguration().setName(CACHE2);
+
+ cfg.setCacheConfiguration(ccfg1, ccfg2);
return cfg;
}
/**
+ * @return Cache configuration.
+ */
+ protected abstract CacheConfiguration cacheConfiguration();
+
+ /**
* @return {@code True} for partitioned caches.
*/
protected boolean partitioned() {
@@ -529,6 +543,31 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
}
/**
+ * @throws Exception If failed.
+ */
+ public void testTwoCaches() throws Exception {
+ IgniteCache<Integer, String> cache1 = ignite1.cache(CACHE1);
+ IgniteCache<Integer, String> cache2 = ignite1.cache(CACHE2);
+
+ final Integer key = primaryKey(cache1);
+
+ Lock lock = cache1.lock(key);
+
+ lock.lock();
+
+ try {
+ assertTrue(cache1.isLocalLocked(key, true));
+ assertTrue(cache1.isLocalLocked(key, false));
+
+ assertFalse(cache2.isLocalLocked(key, true));
+ assertFalse(cache2.isLocalLocked(key, false));
+ }
+ finally {
+ lock.unlock();
+ }
+ }
+
+ /**
* Cache unlock listener.
*/
private class UnlockListener implements IgnitePredicate<Event> {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/653d411c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java
index a782aec..bbc56e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java
@@ -29,9 +29,7 @@ import static org.apache.ignite.cache.CacheMode.*;
*/
public class GridCachePartitionedMultiNodeLockSelfTest extends GridCacheMultiNodeLockAbstractTest {
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
-
+ @Override protected CacheConfiguration cacheConfiguration() {
CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
@@ -39,9 +37,7 @@ public class GridCachePartitionedMultiNodeLockSelfTest extends GridCacheMultiNod
cc.setAtomicityMode(TRANSACTIONAL);
cc.setNearConfiguration(new NearCacheConfiguration());
- c.setCacheConfiguration(cc);
-
- return c;
+ return cc;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/653d411c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java
index 70e0ad6..bf3620b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMultiNodeLockSelfTest.java
@@ -32,15 +32,11 @@ public class GridCacheReplicatedMultiNodeLockSelfTest extends GridCacheMultiNode
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration() throws Exception {
- IgniteConfiguration cfg = super.getConfiguration();
-
+ @Override protected CacheConfiguration cacheConfiguration() {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(REPLICATED);
- cfg.setCacheConfiguration(cacheCfg);
-
- return cfg;
+ return cacheCfg;
}
}
[5/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/apache-main/master' into ignite-1258
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/apache-main/master' into ignite-1258
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ceda2afe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ceda2afe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ceda2afe
Branch: refs/heads/ignite-1258
Commit: ceda2afe5fcf586523ab8cfe30ae987e32ae6bb3
Parents: dd12aac 653d411
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Aug 21 17:30:05 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Aug 21 17:30:05 2015 +0300
----------------------------------------------------------------------
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../service/GridServiceProcessor.java | 5 +++
.../GridCacheMultiNodeLockAbstractTest.java | 41 +++++++++++++++++++-
...idCachePartitionedMultiNodeLockSelfTest.java | 8 +---
...ridCacheReplicatedMultiNodeLockSelfTest.java | 8 +---
.../IgniteCacheFailoverTestSuite2.java | 2 +
7 files changed, 57 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0283580c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0283580c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0283580c
Branch: refs/heads/ignite-1258
Commit: 0283580c376e4fbf31358417f4859d65b2d191aa
Parents: b2cc2ee c55d923
Author: sboikov <sb...@gridgain.com>
Authored: Fri Aug 21 15:36:42 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Aug 21 15:36:42 2015 +0300
----------------------------------------------------------------------
.../internal/processors/service/GridServiceProcessor.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------