ignite-4371
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb930599 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb930599 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb930599 Branch: refs/heads/ignite-4371 Commit: eb930599fb0278909d807da6e34f93b6dd90bf44 Parents: b448ecb Author: sboikov <[email protected]> Authored: Thu Dec 8 16:16:31 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Dec 8 16:16:31 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheIoManager.java | 3 -- .../distributed/dht/GridDhtTxFinishFuture.java | 37 -------------------- .../distributed/dht/GridDhtTxFinishRequest.java | 2 +- .../dht/GridDhtTxPrepareRequest.java | 2 +- .../near/GridNearTxFinishRequest.java | 2 +- .../near/GridNearTxPrepareRequest.java | 2 +- .../cache/transactions/IgniteTxAdapter.java | 6 ---- .../cache/transactions/IgniteTxManager.java | 2 -- .../ignite/internal/util/IgniteUtils.java | 4 +-- .../IgniteTxExceptionAbstractSelfTest.java | 2 +- 10 files changed, 7 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/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 8d58651..924ce79 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 @@ -363,9 +363,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { unmarshall(nodeId, cacheMsg); - if (!cacheMsg.partitionExchangeMessage()) - log.info("Message: " + cacheMsg); - if (cacheMsg.classError() != null) processFailedMessage(nodeId, cacheMsg, c); else http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index 288551b..e93ad63 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -155,43 +155,8 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur * @param e Error. */ public void rollbackOnError(Throwable e) { -// if (ERR_UPD.compareAndSet(this, null, e)) { -// log.info("Dht rollback on error: " + tx.isSystemInvalidate() + " " + System.identityHashCode(tx) + " " + e); -// -// U.dumpStack("rollback on error"); -// -// boolean marked = tx.setRollbackOnly(); -// -// if (e instanceof IgniteTxRollbackCheckedException) { -// if (marked) { -// try { -// tx.rollback(); -// } -// catch (IgniteCheckedException ex) { -// U.error(log, "Failed to automatically rollback transaction: " + tx, ex); -// } -// } -// } -// else if (tx.isSystemInvalidate()) { // Invalidate remote transactions on heuristic error. -// finish(true); -// -// try { -// get(); -// } -// catch (IgniteTxHeuristicCheckedException ignore) { -// // Future should complete with GridCacheTxHeuristicException. -// } -// catch (IgniteCheckedException err) { -// U.error(log, "Failed to invalidate transaction: " + tx, err); -// } -// } -// -// onComplete(); -// } assert e != null; - log.info("Dht rollback on error: " + tx.isSystemInvalidate() + " " + System.identityHashCode(tx) + " " + e); - if (ERR_UPD.compareAndSet(this, null, e)) { tx.setRollbackOnly(); @@ -294,8 +259,6 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur */ @SuppressWarnings({"SimplifiableIfStatement", "IfMayBeConditional"}) public void finish(boolean commit) { - log.info("Dht finish: " + commit + " " + System.identityHashCode(tx)); - boolean sync; if (!F.isEmpty(dhtMap) || !F.isEmpty(nearMap)) http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index abacf27..c618a18 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -368,7 +368,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { /** {@inheritDoc} */ @Override public String toString() { - return "GridDhtTxFinishRequest [commit=" + commit() + ", inv=" + isSystemInvalidate() + ']'; + return S.toString(GridDhtTxFinishRequest.class, this, super.toString()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index cf17208..a8f2087 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -356,7 +356,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public String toString() { - return "GridDhtTxPrepareRequest [onePhase=" + onePhaseCommit() + ']'; + return S.toString(GridDhtTxPrepareRequest.class, this, "super", super.toString()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java index 2fc4f83..dfbbe18 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java @@ -338,6 +338,6 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { /** {@inheritDoc} */ @Override public String toString() { - return "GridNearTxFinishRequest [commit=" + commit() + ", inv=" + isInvalidate() + ']'; + return GridToStringBuilder.toString(GridNearTxFinishRequest.class, this, "super", super.toString()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java index 2d243ee..e55566b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java @@ -485,6 +485,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public String toString() { - return "GridNearTxPrepareRequest [onePhase=" + onePhaseCommit() + ']'; + return S.toString(GridNearTxPrepareRequest.class, this, super.toString()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index f4791bf..18c3011 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -318,8 +318,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement if (log == null) log = U.logger(cctx.kernalContext(), logRef, this); - - log.info("Created " + getClass().getSimpleName()); } /** @@ -369,8 +367,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement if (log == null) log = U.logger(cctx.kernalContext(), logRef, this); - - log.info("Created " + getClass().getSimpleName()); } /** {@inheritDoc} */ @@ -1135,8 +1131,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement if (log.isDebugEnabled()) log.debug("Changed transaction state [prev=" + prev + ", new=" + this.state + ", tx=" + this + ']'); - log.info("Changed state " + getClass().getSimpleName() + " " + state); - notifyAll(); } else { http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/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 36f3c84..bd8e18b 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 @@ -1300,8 +1300,6 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { if (log.isDebugEnabled()) log.debug("Rolling back from TM [locNodeId=" + cctx.localNodeId() + ", tx=" + tx + ']'); - log.info("rollback " + tx.getClass().getSimpleName()); - // 1. Record transaction version to avoid duplicates. addRolledbackTx(tx); http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 3e31170..3dfb3c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -4268,9 +4268,9 @@ public abstract class IgniteUtils { if (log != null) { if (e == null) - log.info(compact(longMsg.toString())); + log.error(compact(longMsg.toString())); else - log.info(compact(longMsg.toString()) + " " + e); + log.error(compact(longMsg.toString()), e); } else { X.printerr("[" + SHORT_DATE_FMT.format(new java.util.Date()) + "] (err) " + http://git-wip-us.apache.org/repos/asf/ignite/blob/eb930599/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 8972c3b..95161c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -276,7 +276,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutMultipleKeysTx() throws Exception { - for (TransactionConcurrency concurrency : new TransactionConcurrency[]{TransactionConcurrency.PESSIMISTIC}) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY),
