Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 1aa172ee8 -> 1de5fe5aa
#IGNITE-80 Debug Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1de5fe5a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1de5fe5a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1de5fe5a Branch: refs/heads/ignite-80 Commit: 1de5fe5aa61f9c4c93adf3ab274529e90ce42e41 Parents: 1aa172e Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Apr 15 15:41:55 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Apr 15 15:41:55 2015 -0700 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLockFuture.java | 2 +- .../GridCacheQueueMultiNodeAbstractSelfTest.java | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1de5fe5a/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 d531308..ca16157 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 @@ -902,7 +902,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo cctx.io().send(n, req, cctx.ioPolicy()); } else - GridDebug.debug("Will not send lock request to DHT node: " + tx); + GridDebug.debug("Will not send lock request to DHT node: " + tx.xidVersion()); } catch (IgniteCheckedException e) { // Fail the whole thing. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1de5fe5a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index b39017e..e4bb2b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -311,7 +311,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl Collection<IgniteInternalFuture> futs = new ArrayList<>(); final int THREADS_PER_NODE = 3; - final int ITEMS_PER_THREAD = 1000; + final int ITEMS_PER_THREAD = 300; for (int i = 0; i < GRID_CNT; i++) { final int idx = i; @@ -322,9 +322,15 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl IgniteQueue<Integer> queue = grid(idx).queue(queueName, 0, colCfg); - for (int i = 0; i < ITEMS_PER_THREAD; i++) + for (int i = 0; i < ITEMS_PER_THREAD; i++) { assertTrue(queue.add(i)); + if (i > 0 && i % 100 == 0) + info("Finished: " + i); + } + + info("Finished"); + return null; } }, THREADS_PER_NODE, "testPutMultiNode")); @@ -376,7 +382,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl final int PUT_THREADS_PER_NODE = 3; final int POLL_THREADS_PER_NODE = 2; - final int ITEMS_PER_THREAD = 1000; + final int ITEMS_PER_THREAD = 300; final AtomicBoolean stopPoll = new AtomicBoolean(); @@ -391,9 +397,13 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl IgniteQueue<Integer> queue = grid(idx).queue(queueName, 0, colCfg); - for (int i = 0; i < ITEMS_PER_THREAD; i++) + for (int i = 0; i < ITEMS_PER_THREAD; i++) { assertTrue(queue.add(i)); + if (i > 0 && i % 100 == 0) + info("Added: " + i); + } + return null; } }, PUT_THREADS_PER_NODE, "testAddPollMultinode"));
