Repository: ignite Updated Branches: refs/heads/ignite-comm-balance-master 2c144628c -> 8d069572f
commented busy locks from IoManager and cache IoManager Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d069572 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d069572 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d069572 Branch: refs/heads/ignite-comm-balance-master Commit: 8d069572f7055f37ea27991cf312140a66ecf09a Parents: 2c14462 Author: Yakov Zhdanov <[email protected]> Authored: Tue Dec 13 16:44:59 2016 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Tue Dec 13 16:44:59 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgniteKernal.java | 4 ++++ .../internal/managers/communication/GridIoManager.java | 7 ------- .../internal/processors/cache/GridCacheIoManager.java | 10 ---------- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 5 +++++ 4 files changed, 9 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8d069572/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 4972d1f..a3015fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -107,6 +107,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache; import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor; import org.apache.ignite.internal.processors.closure.GridClosureProcessor; @@ -1139,6 +1140,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { " ^-- Outbound messages queue [size=" + m.getOutboundMessagesQueueSize() + "]"; log.info(msg); + + log.info("Async ops in GridDhtAtomicCache: " + + GridDhtAtomicCache.adderAsyncOp.sumThenReset()); } catch (IgniteClientDisconnectedException ignore) { // No-op. http://git-wip-us.apache.org/repos/asf/ignite/blob/8d069572/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 0703a3a..34e406a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -625,10 +625,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa assert nodeId != null; assert msg != null; - Lock busyLock0 = busyLock.readLock(); - - busyLock0.lock(); - try { if (stopping) { if (log.isDebugEnabled()) @@ -715,9 +711,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa catch (IgniteCheckedException e) { U.error(log, "Failed to process message (will ignore): " + msg, e); } - finally { - busyLock0.unlock(); - } } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/8d069572/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 3975f92..bdaf3a0 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 @@ -26,7 +26,6 @@ import java.util.UUID; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; @@ -349,10 +348,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { @SuppressWarnings({"unchecked", "ConstantConditions", "ThrowableResultOfMethodCallIgnored"}) private void onMessage0(final UUID nodeId, final GridCacheMessage cacheMsg, final IgniteBiInClosure<UUID, GridCacheMessage> c) { - Lock lock = rw.readLock(); - - lock.lock(); - try { if (stopping) { if (log.isDebugEnabled()) @@ -381,8 +376,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { finally { if (depEnabled) cctx.deploy().ignoreOwnership(false); - - lock.unlock(); } } @@ -825,9 +818,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { */ private void processMessage(UUID nodeId, GridCacheMessage msg, IgniteBiInClosure<UUID, GridCacheMessage> c) { try { - // We will not end up with storing a bunch of new UUIDs - // in each cache entry, since node ID is stored in NIO session - // on handshake. c.apply(nodeId, msg); if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/8d069572/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 0e60ff4..43f1ce9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -103,6 +103,7 @@ import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentLinkedDeque8; +import org.jsr166.LongAdder8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT; @@ -806,6 +807,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { return ctx.writeThrough() && ctx.store().configured(); } + public static final LongAdder8 adderAsyncOp = new LongAdder8(); + /** * @param op Operation closure. * @return Future. @@ -815,6 +818,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { if (!asyncToggled) return op.apply(); + adderAsyncOp.increment(); + IgniteInternalFuture<T> fail = asyncOpAcquire(); if (fail != null)
