Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 848a2527e -> e7b162971
#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/e7b16297 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e7b16297 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e7b16297 Branch: refs/heads/ignite-80 Commit: e7b162971573bc5b7a888287b663ac32a89c458a Parents: 848a252 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sun Apr 19 20:13:48 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sun Apr 19 20:13:48 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheIoManager.java | 11 ----------- .../internal/processors/cache/GridCacheProcessor.java | 2 -- .../cache/distributed/dht/GridDhtLockFuture.java | 10 ---------- .../dht/GridDhtTransactionalCacheAdapter.java | 3 --- .../dht/colocated/GridDhtColocatedLockFuture.java | 2 -- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 8 -------- .../cache/distributed/near/GridNearLockFuture.java | 5 ----- .../cache/distributed/near/GridNearTxPrepareFuture.java | 3 --- 8 files changed, 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index c395cdd..f10f241 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -95,9 +95,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { } } else { - GridDebug.debug("Received unordered cache communication message [nodeId=" + nodeId + - ", locId=" + cctx.localNodeId() + ", msg=" + msg + ']'); - AffinityTopologyVersion locAffVer = cctx.exchange().readyAffinityVersion(); AffinityTopologyVersion rmtAffVer = cacheMsg.topologyVersion(); @@ -107,9 +104,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { ", locTopVer=" + locAffVer + ", rmtTopVer=" + rmtAffVer + ']'); fut = cctx.exchange().affinityReadyFuture(rmtAffVer); - - GridDebug.debug("Received message has higher affinity topology version [msg=" + msg + - ", locTopVer=" + locAffVer + ", rmtTopVer=" + rmtAffVer + ", waitFut=" + fut + ']'); } } @@ -148,13 +142,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { c = clsHandlers.get(new ListenerKey(cacheMsg.cacheId(), cacheMsg.getClass())); if (c == null) { - if (log.isDebugEnabled()) - log.debug("Received message without registered handler (will ignore) [msg=" + cacheMsg + - ", nodeId=" + nodeId + ']'); U.warn(log, "Received message without registered handler (will ignore) [msg=" + cacheMsg + ", nodeId=" + nodeId + ']'); - GridDebug.debug("Received message without registered handler (will ignore) [msg=" + cacheMsg + - ", nodeId=" + nodeId + ']'); return; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 1306f59..fb7e0ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -907,8 +907,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { cacheCtx.onStarted(); - GridDebug.debug("Started cache [locNodeId=" + cacheCtx.localNodeId() + ", cacheId=" + cacheCtx.cacheId() + ']'); - if (log.isInfoEnabled()) log.info("Started cache [name=" + U.maskName(cfg.getName()) + ", mode=" + cfg.getCacheMode() + ']'); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/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 ca16157..c478522 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 @@ -527,7 +527,6 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo private void readyLocks() { if (log.isDebugEnabled()) log.debug("Marking local locks as ready for DHT lock future: " + this); - GridDebug.debug("Marking local locks as ready for DHT lock future: " + lockVer + ", near=" + nearLockVer); for (int i = 0; i < entries.size(); i++) { while (true) { @@ -636,9 +635,6 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo * @return {@code True} if locks have been acquired. */ private boolean checkLocks() { - if (!pendingLocks.isEmpty()) - GridDebug.debug("Pending locks for DHT lock future [lockVer=" + lockVer + ", pending=" + pendingLocks + ']'); - return pendingLocks.isEmpty(); } @@ -694,8 +690,6 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo if (err.get() == null) loadMissingFromStore(); - GridDebug.debug("Completing DHT lock future: " + this); - if (super.onDone(success, err.get())) { if (log.isDebugEnabled()) log.debug("Completing future: " + this); @@ -897,12 +891,8 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo if (log.isDebugEnabled()) log.debug("Sending DHT lock request to DHT node [node=" + n.id() + ", req=" + req + ']'); - GridDebug.debug("Sending DHT lock request to DHT node [node=" + n.id() + ", req=" + req + ']'); - cctx.io().send(n, req, cctx.ioPolicy()); } - else - 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/e7b16297/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 1dc72d0..5e43f0f 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 @@ -513,9 +513,6 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach log.debug("Processing near lock request [locNodeId=" + locNodeId + ", nodeId=" + nodeId + ", req=" + req + ']'); - GridDebug.debug(log, "Processing near lock request [locNodeId=" + locNodeId + ", nodeId=" + nodeId + ", req=" + req + - ']'); - ClusterNode nearNode = ctx.discovery().node(nodeId); if (nearNode == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index ecd81a3..8f62a28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -475,8 +475,6 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity if (tx != null) cctx.tm().txContext(tx); - GridDebug.debug("Completing colocated lock future: " + this); - if (super.onDone(success, err.get())) { if (log.isDebugEnabled()) log.debug("Completing future: " + this); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 767502d..36054d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -575,8 +575,6 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT break; } catch (IgniteFutureTimeoutCheckedException ignored) { - U.debug(log, "Release future: " + partReleaseFut); - // Print pending transactions and locks that might have led to hang. dumpPendingObjects(); } @@ -838,8 +836,6 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT @Override public boolean onDone(AffinityTopologyVersion res, Throwable err) { cctx.cache().onExchangeDone(exchId.topologyVersion(), reqs, err); - GridDebug.debug("Completing exchange [locNodeId=" + cctx.localNodeId() + ", exchId=" + exchId + ']'); - cctx.exchange().onExchangeDone(this, err); if (super.onDone(res, err) && !dummy && !forcePreload) { @@ -1245,10 +1241,6 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT return; try { - U.debug(log, "Dumping last messages..."); - - GridDebug.dumpWithReset(log); - dumpPendingObjects(); U.warn(log, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java index a6c84fe..5fb401a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java @@ -536,9 +536,6 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B log.debug("Lock is still not acquired for entry (will keep waiting) [entry=" + cached + ", fut=" + this + ']'); - GridDebug.debug("Lock is still not acquired for entry (will keep waiting) [entry=" + - cached + ", lockVer=" + lockVer + ']'); - return false; } @@ -610,8 +607,6 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B if (tx != null) cctx.tm().txContext(tx); - GridDebug.debug("Completing near lock future: " + this); - if (super.onDone(success, err.get())) { if (log.isDebugEnabled()) log.debug("Completing future: " + this); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java index 3dbb652..75c3d9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java @@ -399,9 +399,6 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut GridDhtTopologyFuture fut = nonLocCtx.topology().topologyVersionFuture(); - GridDebug.debug("Will use topology version future for prepare [locNodeId=" + cctx.localNodeId() + - ", tx=" + tx + ", fut=" + fut + ']'); - return fut; }
