Lock tracing
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4629f21d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4629f21d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4629f21d Branch: refs/heads/ignite-5797 Commit: 4629f21d9d1e250d816880245444aaa946d3b754 Parents: 1767dce Author: Alexey Goncharuk <[email protected]> Authored: Thu Oct 4 18:53:49 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Oct 4 18:53:49 2018 +0300 ---------------------------------------------------------------------- .../distributed/GridDistributedLockResponse.java | 1 + .../dht/GridDhtTransactionalCacheAdapter.java | 2 ++ .../cache/transactions/IgniteTxHandler.java | 1 + .../trace/GridCacheTxTracingSelfTest.java | 16 ++++++++-------- 4 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4629f21d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index a8e20a6..f4dc17a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -154,6 +154,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage impl this.cacheId = cacheId; this.futId = futId; this.err = err; + this.evtsTrace = evtsTrace; vals = new ArrayList<>(cnt); } http://git-wip-us.apache.org/repos/asf/ignite/blob/4629f21d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java index 2bc0f2d..8d84fd0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java @@ -1172,6 +1172,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach top.readUnlock(); } + tx.nodeTrace(req.nodeTrace()); + boolean timedOut = false; for (KeyCacheObject key : keys) { http://git-wip-us.apache.org/repos/asf/ignite/blob/4629f21d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index 44ce649..055d8d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -505,6 +505,7 @@ public class IgniteTxHandler { if (req.explicitLock()) tx.explicitLock(true); + tx.nodeTrace(req.nodeTrace()); tx.transactionNodes(req.transactionNodes()); if (req.near()) http://git-wip-us.apache.org/repos/asf/ignite/blob/4629f21d/modules/core/src/test/java/org/apache/ignite/internal/processors/trace/GridCacheTxTracingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/trace/GridCacheTxTracingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/trace/GridCacheTxTracingSelfTest.java index 72d5b63..99b83d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/trace/GridCacheTxTracingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/trace/GridCacheTxTracingSelfTest.java @@ -51,6 +51,8 @@ public class GridCacheTxTracingSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(ccfg); + cfg.setConsistentId(igniteInstanceName); + if (getTestIgniteInstanceName(GRID_CNT - 1).equals(igniteInstanceName)) cfg.setClientMode(true); @@ -72,16 +74,14 @@ public class GridCacheTxTracingSelfTest extends GridCommonAbstractTest { IgniteCache<Object, Object> cache = client.cache(DEFAULT_CACHE_NAME); - for (int r = 0; r < 1000; r++) { - try (Transaction tx = client.transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { - for (int i = 0; i < 10; i++) - cache.put(i, i); + try (Transaction tx = client.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + for (int i = 0; i < 9; i++) + cache.put(i, i); - tx.commit(); + tx.commit(); - if (r == 999) - System.out.println("A"); - } + if (GRID_CNT == 4) + System.out.println("A"); } } }
