Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 5a799f822 -> c74e684da
#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/c74e684d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c74e684d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c74e684d Branch: refs/heads/ignite-80 Commit: c74e684da24d102ea26a87d7bd3e8e5d6c15768c Parents: 5a799f8 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Apr 27 17:53:48 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Apr 27 17:53:48 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheMvcc.java | 4 ++++ .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../internal/processors/cache/transactions/IgniteTxManager.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c74e684d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java index 83a108f..8f2f395 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -689,6 +690,9 @@ public final class GridCacheMvcc { if (c.owner()) continue; + if (c.ready()) + GridDebug.dump(log); + assert !c.ready() : "Cannot have more then one ready near-local candidate [c=" + c + ", cand=" + cand + ", mvcc=" + this + ']'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c74e684d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 6f19597..0ed50db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -493,7 +493,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu tx.state(PREPARED); } - U.debug(log, "Completing DHT tx prepare future [locNodeId=" + cctx.localNodeId() + ", ver=" + tx.xidVersion() + ", nearVer=" + tx.nearXidVersion() + ']'); + GridDebug.debug("Completing DHT tx prepare future [locNodeId=" + cctx.localNodeId() + ", ver=" + tx.xidVersion() + ", nearVer=" + tx.nearXidVersion() + ']'); if (tx.onePhaseCommit()) { assert last; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c74e684d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index a953f5c..0f14fe8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -1199,7 +1199,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { if (log.isDebugEnabled()) log.debug("Committing from TM [locNodeId=" + cctx.localNodeId() + ", tx=" + tx + ']'); - U.debug(log, "Committing from TM [locNodeId=" + cctx.localNodeId() + ", xidVer=" + tx.xidVersion() + + GridDebug.debug("Committing from TM [locNodeId=" + cctx.localNodeId() + ", xidVer=" + tx.xidVersion() + ", type=" + tx.getClass().getSimpleName() + ']'); if (tx.timeout() > 0) {
