Perftest.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/311d384e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/311d384e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/311d384e Branch: refs/heads/ignite-perftest Commit: 311d384e5e0b0a2d2c8c1c4a7390d4db33cbd9ff Parents: 0e04c51 Author: Alexey Goncharuk <[email protected]> Authored: Mon Nov 9 13:13:44 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Nov 9 13:13:44 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalGatewayImpl.java | 8 +++--- .../processors/cache/GridCacheGateway.java | 26 +++++++++++--------- .../dht/GridDhtPartitionTopologyImpl.java | 3 +++ .../util/nio/GridSelectorNioSessionImpl.java | 4 +-- 4 files changed, 23 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/311d384e/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java index fe8c580..dbf2f73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java @@ -73,13 +73,13 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable { if (stackTrace == null) stackTrace = stackTrace(); - rwLock.readLock(); +// rwLock.readLock(); GridKernalState state = this.state.get(); if (state != GridKernalState.STARTED) { // Unlock just acquired lock. - rwLock.readUnlock(); +// rwLock.readUnlock(); if (state == GridKernalState.DISCONNECTED) { assert reconnectFut != null; @@ -96,7 +96,7 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable { if (stackTrace == null) stackTrace = stackTrace(); - rwLock.readLock(); +// rwLock.readLock(); if (state.get() == GridKernalState.DISCONNECTED) throw new IgniteClientDisconnectedException(reconnectFut, "Client node disconnected: " + gridName); @@ -104,7 +104,7 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable { /** {@inheritDoc} */ @Override public void readUnlock() { - rwLock.readUnlock(); +// rwLock.readUnlock(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/311d384e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java index 0eac5ba..8a1f0c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java @@ -63,9 +63,9 @@ public class GridCacheGateway<K, V> { if (ctx.deploymentEnabled()) ctx.deploy().onEnter(); - rwLock.readLock(); +// rwLock.readLock(); - checkState(true, true); +// checkState(true, true); } /** @@ -106,10 +106,11 @@ public class GridCacheGateway<K, V> { onEnter(); // Must unlock in case of unexpected errors to avoid deadlocks during kernal stop. - rwLock.readLock(); - - return checkState(true, false); +// rwLock.readLock(); +// +// return checkState(true, false); + return true; } /** @@ -120,7 +121,8 @@ public class GridCacheGateway<K, V> { public boolean enterIfNotStoppedNoLock() { onEnter(); - return checkState(false, false); +// return checkState(false, false); + return true; } /** @@ -143,7 +145,7 @@ public class GridCacheGateway<K, V> { leaveNoLock(); } finally { - rwLock.readUnlock(); +// rwLock.readUnlock(); } } @@ -169,9 +171,9 @@ public class GridCacheGateway<K, V> { onEnter(); - rwLock.readLock(); - - checkState(true, true); +// rwLock.readLock(); +// +// checkState(true, true); // Must unlock in case of unexpected errors to avoid // deadlocks during kernal stop. @@ -179,7 +181,7 @@ public class GridCacheGateway<K, V> { return setOperationContextPerCall(opCtx); } catch (Throwable e) { - rwLock.readUnlock(); +// rwLock.readUnlock(); throw e; } @@ -220,7 +222,7 @@ public class GridCacheGateway<K, V> { leaveNoLock(prev); } finally { - rwLock.readUnlock(); +// rwLock.readUnlock(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/311d384e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 6bd283a..0afe70b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@ -686,6 +686,9 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { @Override public Collection<ClusterNode> nodes(int p, AffinityTopologyVersion topVer) { Collection<ClusterNode> affNodes = cctx.affinity().nodes(p, topVer); + if (true) + return affNodes; + lock.readLock().lock(); try { http://git-wip-us.apache.org/repos/asf/ignite/blob/311d384e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java index 6b1f6a7..6458502 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java @@ -51,7 +51,7 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl { /** Semaphore. */ @GridToStringExclude - private final Semaphore sem; + private final Semaphore sem = null; /** Write buffer. */ private ByteBuffer writeBuf; @@ -103,7 +103,7 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl { this.selectorIdx = selectorIdx; - sem = sndQueueLimit > 0 ? new Semaphore(sndQueueLimit) : null; +// sem = sndQueueLimit > 0 ? new Semaphore(sndQueueLimit) : null; if (writeBuf != null) { writeBuf.clear();
