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 14:36:48 UTC
[1/2] incubator-ignite git commit: Added failover test for cross
cache transactions,
fixed GridDistributedCacheEntry.checkThreadChain to use proper cache.
Repository: incubator-ignite
Updated Branches:
refs/heads/master c55d9231f -> 0283580c3
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/master
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;
}
}
[2/2] 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/master
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(+)
----------------------------------------------------------------------