Repository: ignite Updated Branches: refs/heads/ignite-1.4-slow-server-debug a96761577 -> a3ade089b
Debugging slowdowns Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a3ade089 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a3ade089 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a3ade089 Branch: refs/heads/ignite-1.4-slow-server-debug Commit: a3ade089be3ba233bcdce7bdbc01d76447e65598 Parents: a967615 Author: Yakov Zhdanov <[email protected]> Authored: Wed Oct 21 15:29:22 2015 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Wed Oct 21 15:29:22 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/Bench.java | 6 ++++- .../distributed/dht/GridDhtTxPrepareFuture.java | 24 -------------------- .../preloader/GridDhtPartitionsFullMessage.java | 1 - .../near/GridNearTxFinishFuture.java | 6 ++--- .../cache/transactions/IgniteTxAdapter.java | 1 - .../util/future/GridCompoundFuture.java | 1 + .../continuous/GridEventConsumeSelfTest.java | 2 +- 7 files changed, 10 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a3ade089/modules/core/src/main/java/org/apache/ignite/internal/Bench.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/Bench.java b/modules/core/src/main/java/org/apache/ignite/internal/Bench.java index cc021bb..d8d9c50 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/Bench.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/Bench.java @@ -28,6 +28,8 @@ import java.util.concurrent.atomic.AtomicLong; * */ public class Bench { + public static volatile boolean shit; + public static void main(String[] args) throws InterruptedException { Ignition.start(config("1", false)); @@ -42,12 +44,14 @@ public class Bench { final IgniteCache<Object, Object> cache = ignite.getOrCreateCache(new CacheConfiguration<>() - .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL) + .setAtomicityMode(CacheAtomicityMode.ATOMIC) .setBackups(1).setRebalanceMode(CacheRebalanceMode.SYNC) .setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC)); Thread.sleep(2000); + shit = true; + final LongAdder8 cnt = new LongAdder8(); final AtomicLong time = new AtomicLong(U.currentTimeMillis()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a3ade089/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 c4e4202..1a0127b 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 @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteInterruptedException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; @@ -796,9 +795,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter onComplete(res); } - // TODO Remove - static boolean debug = IgniteSystemProperties.getBoolean("TX_DEBUG"); - /** * Initializes future. * @@ -819,26 +815,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter this.writes = writes; this.txNodes = txNodes; - // TODO Remove (for debug only) - if (debug) { - Collection<UUID> backups = txNodes.get(cctx.localNodeId()); - - if (backups != null && backups.size() >= 2 && writes != null && writes.size() == 1){ - U.debug( - log, - "\n>>>\n>>> TX nodes [txNodes=" + txNodes + ", txFut=" + this + ']'); - - for (IgniteTxEntry entry : writes) { - U.debug( - log, - "\tEntry: " + entry); - U.debug( - log, - "\tPartitions: " + entry.context().topology().partitionMap(false).toFullString()); - } - } - } - if (!F.isEmpty(writes)) { Map<Integer, Collection<KeyCacheObject>> forceKeys = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/a3ade089/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 5429538..c06d773 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -203,4 +203,3 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa "super", super.toString()); } } - http://git-wip-us.apache.org/repos/asf/ignite/blob/a3ade089/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index 54652bc6..08082c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -512,9 +512,9 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu if (m.node().isLocal()) { IgniteInternalFuture<IgniteInternalTx> fut = cctx.tm().txHandler().finishColocatedLocal(commit, tx); - // Add new future. TODO: revisit -// if (fut != null) -// add(fut); + // Add new future. + if (fut != null) + add(fut); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a3ade089/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 a84a537..e8a43c9 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 @@ -98,7 +98,6 @@ import static org.apache.ignite.transactions.TransactionState.ROLLING_BACK; /** * Managed transaction adapter. - * TODO: scytheout */ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implements IgniteInternalTx, Externalizable { http://git-wip-us.apache.org/repos/asf/ignite/blob/a3ade089/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java index e454b32..bb4e3e7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java @@ -133,6 +133,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> { return res; } } + /** * Gets collection of futures. * http://git-wip-us.apache.org/repos/asf/ignite/blob/a3ade089/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java index a2308c6..8f5e07b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java @@ -1090,4 +1090,4 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { assertEquals("Not stopped IDs: " + notStopped, 0, notStopped.size()); } -} \ No newline at end of file +}
