Repository: ignite Updated Branches: refs/heads/ignite-comm-balance-master 8d069572f -> 4e5fd3e1d
removed reservation cas in comm client Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4e5fd3e1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4e5fd3e1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4e5fd3e1 Branch: refs/heads/ignite-comm-balance-master Commit: 4e5fd3e1d00c338eb774188c1cc63b6ddde6679c Parents: 8d06957 Author: Yakov Zhdanov <[email protected]> Authored: Wed Dec 14 13:18:54 2016 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Wed Dec 14 13:18:54 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 4 --- .../dht/atomic/GridDhtAtomicCache.java | 5 --- .../nio/GridAbstractCommunicationClient.java | 34 ++++++-------------- 3 files changed, 9 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4e5fd3e1/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 a3015fa..4972d1f 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,7 +107,6 @@ 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; @@ -1140,9 +1139,6 @@ 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/4e5fd3e1/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 43f1ce9..0e60ff4 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,7 +103,6 @@ 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; @@ -807,8 +806,6 @@ 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. @@ -818,8 +815,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { if (!asyncToggled) return op.apply(); - adderAsyncOp.increment(); - IgniteInternalFuture<T> fail = asyncOpAcquire(); if (fail != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/4e5fd3e1/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java index f2ab932..9ae13f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.util.nio; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; @@ -30,7 +30,7 @@ public abstract class GridAbstractCommunicationClient implements GridCommunicati private volatile long lastUsed = U.currentTimeMillis(); /** Reservations. */ - private final AtomicInteger reserves = new AtomicInteger(); + private final AtomicBoolean closed = new AtomicBoolean(); /** Metrics listener. */ protected final GridNioMetricsListener metricsLsnr; @@ -54,48 +54,32 @@ public abstract class GridAbstractCommunicationClient implements GridCommunicati /** {@inheritDoc} */ @Override public boolean close() { - return reserves.compareAndSet(0, -1); + return !closed.get() && closed.compareAndSet(false, true); } /** {@inheritDoc} */ @Override public void forceClose() { - reserves.set(-1); + closed.set(false); } /** {@inheritDoc} */ @Override public boolean closed() { - return reserves.get() == -1; + return closed.get(); } /** {@inheritDoc} */ @Override public boolean reserve() { - while (true) { - int r = reserves.get(); - - if (r == -1) - return false; - - if (reserves.compareAndSet(r, r + 1)) - return true; - } + return !closed.get(); } /** {@inheritDoc} */ @Override public void release() { - while (true) { - int r = reserves.get(); - - if (r == -1) - return; - - if (reserves.compareAndSet(r, r - 1)) - return; - } + // No-op. } /** {@inheritDoc} */ @Override public boolean reserved() { - return reserves.get() > 0; + return false; } /** {@inheritDoc} */ @@ -119,4 +103,4 @@ public abstract class GridAbstractCommunicationClient implements GridCommunicati @Override public String toString() { return S.toString(GridAbstractCommunicationClient.class, this); } -} \ No newline at end of file +}
